-----Original Message-----
From: Ilia Alshanetsky [mailto:[EMAIL PROTECTED]
Sent: Wednesday, June 01, 2005 8:21 PM
To: Dmitry Stogov
Cc: php-cvs@lists.php.net
Subject: Re: [PHP-CVS] cvs: php-src /main/streams streams.c
Is there a test case or an example of a bug that required this fix?
ilia
Dmitry Stogov wrote:
dmitry Wed Jun 1 11:11:44 2005 EDT
Modified files:
/php-src/main/streams streams.c
Log:
Disabled search of recored separator outside of buffer
http://cvs.php.net/diff.php/php-src/main/streams/streams.c?r1=1.80&r2=
1.81&ty=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.80
php-src/main/streams/streams.c:1.81
--- php-src/main/streams/streams.c:1.80 Mon May 23 11:36:58 2005
+++ php-src/main/streams/streams.c Wed Jun 1 11:11:44 2005
@@ -19,7 +19,7 @@
+-------------------------------------------------------------
---------+
*/
-/* $Id: streams.c,v 1.80 2005/05/23 15:36:58 tony2001 Exp $ */
+/* $Id: streams.c,v 1.81 2005/06/01 15:11:44 dmitry Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -852,9 +852,9 @@
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) {
