php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-25 17:08:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

MFH:

Browse Source 
- Fix the fix
- Improved test
This commit is contained in:
Felipe Pena
2008-10-30 14:36:34 +00:00
parent 930fad7381
commit 94e5be1bdc
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/standard/streamsfuncs.c
+1 -1
View File
@@ -406,7 +406,7 @@ PHP_FUNCTION(stream_get_contents)
php_stream_from_zval(stream, &zsrc);
if (pos >= 0 && php_stream_seek(stream, pos, SEEK_SET) < 0) {
if ((pos > 0 || (pos == 0 && ZEND_NUM_ARGS() > 2)) && php_stream_seek(stream, pos, SEEK_SET) < 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to seek to position %ld in the stream", pos);
RETURN_FALSE;
}
ext/standard/tests/streams/bug46426.phpt
+15 -3
View File
@@ -7,16 +7,28 @@ $tmp = tmpfile();
fwrite($tmp, "12345");
echo stream_get_contents($tmp, 2, 1);
echo "\n";
echo stream_get_contents($tmp, -1);
echo "\n";
echo stream_get_contents($tmp, -1, 0);
echo "\n";
echo stream_get_contents($tmp, -1, 1);
echo "\n";
echo stream_get_contents($tmp, -1, 2);
echo "\n";
echo stream_get_contents($tmp, 0, 0);
echo "\n";
echo stream_get_contents($tmp, 1, 0);
echo "\n";
echo stream_get_contents($tmp, -1);
@unlink($tmp);
?>
--EXPECT--
23
45
12345
2345
345
1
2345