iliaa Mon Dec 10 14:18:03 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/file bug43522.phpt
Modified files:
/php-src/main/streams streams.c
/php-src NEWS
Log:
MFB: 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&r2=1.82.2.6.2.19&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.6.2.18
php-src/main/streams/streams.c:1.82.2.6.2.19
--- php-src/main/streams/streams.c:1.82.2.6.2.18 Wed Aug 8 07:01:49 2007
+++ php-src/main/streams/streams.c Mon Dec 10 14:18:02 2007
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.82.2.6.2.18 2007/08/08 07:01:49 jani Exp $ */
+/* $Id: streams.c,v 1.82.2.6.2.19 2007/12/10 14:18:02 iliaa Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -856,9 +856,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/NEWS?r1=1.2027.2.547.2.1031&r2=1.2027.2.547.2.1032&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1031 php-src/NEWS:1.2027.2.547.2.1032
--- php-src/NEWS:1.2027.2.547.2.1031 Sun Dec 9 16:55:46 2007
+++ php-src/NEWS Mon Dec 10 14:18:02 2007
@@ -4,6 +4,8 @@
- Fixed weired behavior in CGI parameter parsing. (Dmitry, Hannes Magnusson)
- Fixed bug #43533 (escapeshellarg('') returns null). (Ilia)
+- Fixed bug #43522 (stream_get_line() eats additional characters). (Felipe,
+ Ilia)
- Fixed bug #43495 (array_merge_recursive() crashes with recursive arrays).
(Ilia)
- Fixed bug #43493 (pdo_pgsql does not send username on connect when password
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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
