cvs: php-src(PHP_5_3) /ext/standard/tests/file bug43522.phpt /main/streams streams.c

iliaa Mon Dec 10 14:16:57 2007 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/file bug43522.phpt Modified files: /php-src/main/streams streams.c Log: Fixed bug #43522 (stream_get_line() eats additional characters) http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.18.2.1&r2=1.82.2.6.2.18.2.2&diff_format=u Index: php-src/main/streams/streams.c diff -u php-src/main/streams/streams.c:1.82.2.6.2.18.2.1 php-src/main/streams/streams.c:1.82.2.6.2.18.2.2 --- php-src/main/streams/streams.c:1.82.2.6.2.18.2.1 Tue Nov 6 11:02:36 2007 +++ php-src/main/streams/streams.c Mon Dec 10 14:16:57 2007 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streams.c,v 1.82.2.6.2.18.2.1 2007/11/06 11:02:36 helly Exp $ */ +/* $Id: streams.c,v 1.82.2.6.2.18.2.2 2007/12/10 14:16:57 iliaa Exp $ */ #define _GNU_SOURCE #include "php.h" @@ -860,9 +860,9 @@ 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) { http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug43522.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/bug43522.phpt +++ php-src/ext/standard/tests/file/bug43522.phpt