From: Wez Furlong Date: Mon, 6 Jan 2003 14:00:57 +0000 (+0000) Subject: Fix for bug #21406; infinite loop during filter flushing. X-Git-Tag: PHP_5_0_dev_before_13561_fix~427 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=52a3c29e22a63a5ed3c93be184898975b0eb4df1;p=php Fix for bug #21406; infinite loop during filter flushing. --- diff --git a/main/php_streams.h b/main/php_streams.h index 783d84462d..afd74f4521 100755 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -213,11 +213,11 @@ struct _php_stream_filter { : (stream)->ops->read((stream), (buf), (size) TSRMLS_CC) #define php_stream_filter_flush_next(stream, thisfilter, closing) \ - (thisfilter)->next ? (thisfilter)->next->fops->flush((stream), (thisfilter), (closing) TSRMLS_CC) \ + (thisfilter)->next ? (thisfilter)->next->fops->flush((stream), (thisfilter)->next, (closing) TSRMLS_CC) \ : (stream)->ops->flush((stream) TSRMLS_CC) #define php_stream_filter_eof_next(stream, thisfilter) \ - (thisfilter)->next ? (thisfilter)->next->fops->eof((stream), (thisfilter) TSRMLS_CC) \ + (thisfilter)->next ? (thisfilter)->next->fops->eof((stream), (thisfilter)->next TSRMLS_CC) \ : (stream)->ops->read((stream), NULL, 0 TSRMLS_CC) == EOF ? 1 : 0 #define PHP_STREAM_FLAG_NO_SEEK 1