summaryrefslogtreecommitdiff
path: root/main/streams/streams.c
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2007-12-10 14:16:58 +0000
committerIlia Alshanetsky <iliaa@php.net>2007-12-10 14:16:58 +0000
commitb9e44139625e5576142592a925807e1748ee9ca0 (patch)
tree5038d4554aae15aa40f6d6b49e29bba6c587c7a1 /main/streams/streams.c
parentfdafd5cf81a97f1e7f277ad2250cecee09e13c22 (diff)
downloadphp-git-b9e44139625e5576142592a925807e1748ee9ca0.tar.gz
Fixed bug #43522 (stream_get_line() eats additional characters)
Diffstat (limited to 'main/streams/streams.c')
-rwxr-xr-xmain/streams/streams.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c
index fcc717379b..d627b55514 100755
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -860,9 +860,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) {