Remember that a stream filter failed

So that further reads also fail.

Author: nikic

ext/bz2/bug71263.phpt

@@ -3,8 +3,7 @@ Bug #71263: fread() does not detects decoding errors from filter bzip2.decompres
 --FILE--
 <?php
 
-// This bug is only partially fixed. fread() returns false on the first call
-// but does not fail on the second.
+// Possibly errors should be thrown.
 
 function test($case) {
 	$plain = "The quick brown fox jumps over the lazy dog.";
@@ -50,12 +49,12 @@ test(3);
 Compressed len = 81
 read: bool(false)
 eof: 1
-read: string(0) ""
+read: bool(false)
 Compressed len = 81
 read: string(0) ""
 eof: 1
 read: string(0) ""
 Compressed len = 81
 read: bool(false)
 eof: 1
-read: string(0) ""
+read: bool(false)

main/php_streams.h

@@ -204,6 +204,8 @@ struct _php_stream  {
 	 * PHP_STREAM_FCLOSE_XXX as appropriate */
 	uint8_t fclose_stdiocast:2;
 
+	uint8_t filter_errored:1; /* Stream filter failed fatally */
+
 	uint8_t fgetss_state;		/* for fgetss to handle multiline tags */
 
 	char mode[16];			/* "rwb" etc. ala stdio */

main/streams/streams.c

@@ -538,6 +538,10 @@ PHPAPI int _php_stream_fill_read_buffer(php_stream *stream, size_t size)
 		   main/streams/filter.c::_php_stream_filter_append */
 		stream->writepos = stream->readpos = 0;
 
+		if (stream->filter_errored) {
+			return FAILURE;
+		}
+
 		/* allocate a buffer for reading chunks */
 		chunk_buf = emalloc(stream->chunk_size);
 
@@ -615,6 +619,7 @@ PHPAPI int _php_stream_fill_read_buffer(php_stream *stream, size_t size)
 					/* some fatal error. Theoretically, the stream is borked, so all
 					 * further reads should fail. */
 					stream->eof = 1;
+					stream->filter_errored = 1;
 					efree(chunk_buf);
 					return FAILURE;
 			}