MFH: Fixed bug #44607 (stream_get_line unable to correctly identify the

"ending" in the stream content)

diff --git a/NEWS b/NEWS
index 622f5bb8ae389ecff878b1b63e6a732de6978461..2a91ea3568c9c02cd22da43b5a4f246223c9e434 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,8 @@ PHP                                                                        NEWS
   (Arnaud)
 - Fixed bug #44938 (gettext functions crash with overly long domain).
   (Christian Schneider, Ilia)
+- Fixed bug #44607 (stream_get_line unable to correctly identify the "ending"
+  in the stream content). (Arnaud)
 - Fixed bug #44327 (PDORow::queryString property & numeric offsets / Crash).
   (Felipe)
 - Fixed bug #43452 (strings containing a weekday, or a number plus weekday

diff --git a/ext/standard/tests/file/bug44607.phpt b/ext/standard/tests/file/bug44607.phpt
new file mode 100644 (file)
index 0000000..9eb6d5f
--- /dev/null
+++ b/ext/standard/tests/file/bug44607.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Bug #44607 (stream_get_line unable to correctly identify the "ending" in the stream content)
+--FILE--
+<?php
+$eol = '<EOL>';
+$tempnam = tempnam(sys_get_temp_dir(), 'php');
+$data = str_repeat('.', 14000);
+$data .= $eol;
+$data .= $data;
+file_put_contents($tempnam, $data);
+$fd = fopen($tempnam, 'r');
+var_dump(strlen(stream_get_line($fd, 15000, $eol)));
+var_dump(strlen(stream_get_line($fd, 15000, $eol)));
+fseek($fd, 1, SEEK_SET);
+var_dump(strlen(stream_get_line($fd, 15000, $eol)));
+var_dump(strlen(stream_get_line($fd, 15000, $eol)));
+?>
+--EXPECT--
+int(14000)
+int(14000)
+int(13999)
+int(14000)

diff --git a/main/streams/streams.c b/main/streams/streams.c
index e3add158dd2deacd577d02cbd86be3a5a7267f65..a5f99791d88f1c8ddaf30ade28a905f04ee8618e 100755 (executable)
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -531,16 +531,16 @@ static void php_stream_fill_read_buffer(php_stream *stream, size_t size TSRMLS_D
                efree(chunk_buf);
 
        } else {
+               /* reduce buffer memory consumption if possible, to avoid a realloc */
+               if (stream->readbuf && stream->readbuflen - stream->writepos < stream->chunk_size) {
+                       memmove(stream->readbuf, stream->readbuf + stream->readpos, stream->readbuflen - stream->readpos);
+                       stream->writepos -= stream->readpos;
+                       stream->readpos = 0;
+               }
                /* is there enough data in the buffer ? */
-               if (stream->writepos - stream->readpos < (off_t)size) {
+               while (stream->writepos - stream->readpos < (off_t)size) {
                        size_t justread = 0;
-
-                       /* reduce buffer memory consumption if possible, to avoid a realloc */
-                       if (stream->readbuf && stream->readbuflen - stream->writepos < stream->chunk_size) {
-                               memmove(stream->readbuf, stream->readbuf + stream->readpos, stream->readbuflen - stream->readpos);
-                               stream->writepos -= stream->readpos;
-                               stream->readpos = 0;
-                       }
+                       size_t toread;
 
                        /* grow the buffer if required
                         * TODO: this can fail for persistent streams */
@@ -550,13 +550,17 @@ static void php_stream_fill_read_buffer(php_stream *stream, size_t size TSRMLS_D
                                                stream->is_persistent);
                        }
 
+                       toread = stream->readbuflen - stream->writepos;
                        justread = stream->ops->read(stream, stream->readbuf + stream->writepos,
-                                       stream->readbuflen - stream->writepos
+                                       toread
                                        TSRMLS_CC);
 
                        if (justread != (size_t)-1) {
                                stream->writepos += justread;
                        }
+                       if (stream->eof || justread != toread) {
+                               break;
+                       }
                }
        }
 }