clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.5' into PHP-5.6

Browse Source 
* PHP-5.5:
  Updated NEWS
  Fix bug #68532: convert.base64-encode omits padding bytes
This commit is contained in:
Julien Pauli 2014-12-12 16:50:42 +01:00
commit a0d848f795
3 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ext/standard/tests/file/bug68532.phpt Normal file
View File

@ -0,0 +1,25 @@
--TEST--
Bug #68532: convert.base64-encode omits padding bytes
--FILE--
<?php
$testString = 'test';
$stream = fopen('php://memory','r+');
fwrite($stream, $testString);
rewind($stream);
$filter = stream_filter_append($stream, 'convert.base64-encode');
echo "memoryStream = " . stream_get_contents($stream).PHP_EOL;
$fileStream = fopen(__DIR__ . '/base64test.txt','w+');
fwrite($fileStream , $testString);
rewind($fileStream );
$filter = stream_filter_append($fileStream , 'convert.base64-encode');
echo "fileStream = " . stream_get_contents($fileStream ).PHP_EOL;
?>
--CLEAN--
<?php
unlink(__DIR__ . '/base64test.txt');
?>
--EXPECT--
memoryStream = dGVzdA==
fileStream = dGVzdA==

2
ext/standard/tests/file/stream_rfc2397_007.phpt
View File

@ -27,6 +27,7 @@ foreach($streams as $stream)
var_dump(feof($fp));
echo "===GETC===\n";
var_dump(fgetc($fp));
var_dump(fgetc($fp));
var_dump(ftell($fp));
var_dump(feof($fp));
echo "===REWIND===\n";
@ -94,6 +95,7 @@ int(5)
bool(false)
===GETC===
string(1) "5"
bool(false)
int(6)
bool(true)
===REWIND===

20
main/streams/memory.c
View File

@ -87,15 +87,19 @@ static size_t php_stream_memory_read(php_stream *stream, char *buf, size_t count
php_stream_memory_data *ms = (php_stream_memory_data*)stream->abstract;
assert(ms != NULL);
if (ms->fpos + count >= ms->fsize) {
count = ms->fsize - ms->fpos;
if (ms->fpos == ms->fsize) {
stream->eof = 1;
}
if (count) {
assert(ms->data!= NULL);
assert(buf!= NULL);
memcpy(buf, ms->data+ms->fpos, count);
ms->fpos += count;
count = 0;
} else {
if (ms->fpos + count >= ms->fsize) {
count = ms->fsize - ms->fpos;
}
if (count) {
assert(ms->data!= NULL);
assert(buf!= NULL);
memcpy(buf, ms->data+ms->fpos, count);
ms->fpos += count;
}
}
return count;
}