MFB: Fixed bug #43522 (stream_get_line() eats additional characters)

diff --git a/ext/standard/tests/file/bug43522.phpt b/ext/standard/tests/file/bug43522.phpt
new file mode 100644 (file)
index 0000000..10e44fc
--- /dev/null
+++ b/ext/standard/tests/file/bug43522.phpt
@@ -0,0 +1,25 @@
+--TEST--
+Bug #43522 (stream_get_line() eats additional characters)
+--FILE--
+<?php // 1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
+
+$fp = fopen(__FILE__, 'r'); // Open self
+
+DoTest($fp, 'ZZZ');  // test multi-char delimiter
+DoTest($fp, "Z");  // test single-char delimiter
+
+function DoTest($fp, $delim) {
+       echo "Delimiter:  " . $delim . "\n";
+       rewind($fp);
+       echo "\t" . stream_get_line($fp, 10, $delim) . "\n";
+       echo "\t" . stream_get_line($fp, 10, $delim) . "\n";
+}
+
+?>
+--EXPECT--
+Delimiter:  ZZZ
+       <?php // 1
+       234567890A
+Delimiter:  Z
+       <?php // 1
+       234567890A

diff --git a/main/streams/streams.c b/main/streams/streams.c
index eb80c49038276bb0370ea577bb2e505b6f6a2590..b6d22c6e7041ecfaff8b0b8bcadc3e3f7589e759 100755 (executable)
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -1105,9 +1105,9 @@ PHPAPI char *php_stream_get_record(php_stream *stream, size_t maxlen, size_t *re
                toread = maxlen;
        } else {
                if (delim_len == 1) {
-                       e = memchr(stream->readbuf.s + stream->readpos, *delim, stream->writepos - stream->readpos);
+                       e = memchr(stream->readbuf.s + stream->readpos, *delim, maxlen);
                } else {
-                       e = php_memnstr(stream->readbuf.s + stream->readpos, delim, delim_len, (stream->readbuf.s + stream->writepos));
+                       e = php_memnstr(stream->readbuf.s + stream->readpos, delim, delim_len, (stream->readbuf.s + stream->readpos + maxlen));
                }
 
                if (!e) {