From 201d5df65016c13b2e028de7ca268e71dbd4d798 Mon Sep 17 00:00:00 2001 From: Sara Golemon Date: Tue, 21 Mar 2006 18:28:42 +0000 Subject: [PATCH] Allow grow_mode && !bufstart (original assertion logic) --- main/streams/streams.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/main/streams/streams.c b/main/streams/streams.c index 5f7431a5ae2..8c2ee97855c 100755 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -1112,7 +1112,8 @@ PHPAPI void *_php_stream_get_line(php_stream *stream, int buf_type, zstr buf, si } if (total_copied == 0) { - assert(bufstart.v != NULL || !grow_mode || stream->eof); + assert(stream->eof || !grow_mode || + (grow_mode && bufstart.v == NULL)); return NULL; } @@ -1122,10 +1123,6 @@ PHPAPI void *_php_stream_get_line(php_stream *stream, int buf_type, zstr buf, si buf.s[0] = 0; } - if (returned_len) { - *returned_len = total_copied; - } - return bufstart.s; }