diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2007-12-10 14:18:02 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2007-12-10 14:18:02 +0000 |
| commit | 8a9ad0081d3ab49223cba88994d8c5c212cd07bf (patch) | |
| tree | 9b9528b2cbfb6f00a9f9f204956d892e6ceb5eb4 /main | |
| parent | 63dcbb73f0223f98c8666cee15e73a60891e0191 (diff) | |
| download | php-git-8a9ad0081d3ab49223cba88994d8c5c212cd07bf.tar.gz | |
MFB: Fixed bug #43522 (stream_get_line() eats additional characters)
Diffstat (limited to 'main')
| -rwxr-xr-x | main/streams/streams.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c index ae45653d55..39780cd5a4 100755 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -856,9 +856,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->writepos - stream->readpos); + e = memchr(stream->readbuf + stream->readpos, *delim, maxlen); } else { - e = php_memnstr(stream->readbuf + stream->readpos, delim, delim_len, (stream->readbuf + stream->writepos)); + e = php_memnstr(stream->readbuf + stream->readpos, delim, delim_len, (stream->readbuf + stream->readpos + maxlen)); } if (!e) { |