]> granicus.if.org Git - php/commitdiff
Disabled search of recored separator outside of buffer
authorDmitry Stogov <dmitry@php.net>
Wed, 1 Jun 2005 15:11:44 +0000 (15:11 +0000)
committerDmitry Stogov <dmitry@php.net>
Wed, 1 Jun 2005 15:11:44 +0000 (15:11 +0000)
main/streams/streams.c

index 8b0ee5a3d2c87004f7ebd1749bfe354318971ead..56ef78d525c3dd24c1ff9cfb07ec66227fb46044 100755 (executable)
@@ -852,9 +852,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 + stream->readpos, *delim, stream->readbuflen - stream->readpos);
+                       e = memchr(stream->readbuf + stream->readpos, *delim, stream->writepos - stream->readpos);
                } else {
-                       e = php_memnstr(stream->readbuf + stream->readpos, delim, delim_len, (stream->readbuf + stream->readbuflen));
+                       e = php_memnstr(stream->readbuf + stream->readpos, delim, delim_len, (stream->readbuf + stream->writepos));
                }
 
                if (!e) {