]> 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:15 +0000 (15:11 +0000)
committerDmitry Stogov <dmitry@php.net>
Wed, 1 Jun 2005 15:11:15 +0000 (15:11 +0000)
main/streams/streams.c

index 2149d6394c984316b0f59d9436129dbb7e292299..3fbca6d5382248742ef894ea1d1f2537ce974498 100755 (executable)
@@ -841,9 +841,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) {