cvs: php-src /main/streams filter.c streams.c

cellog Mon Sep 22 01:26:39 2008 UTC Modified files: /php-src/main/streams filter.c streams.c Log: MF52 fix Bug #46147: after stream seek, appending stream filter reads incorrect data http://cvs.php.net/viewvc.cgi/php-src/main/streams/filter.c?r1=1.44&r2=1.45&diff_format=u Index: php-src/main/streams/filter.c diff -u php-src/main/streams/filter.c:1.44 php-src/main/streams/filter.c:1.45 --- php-src/main/streams/filter.c:1.44 Mon Dec 31 07:12:18 2007 +++ php-src/main/streams/filter.c Mon Sep 22 01:26:38 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filter.c,v 1.44 2007/12/31 07:12:18 sebastian Exp $ */ +/* $Id: filter.c,v 1.45 2008/09/22 01:26:38 cellog Exp $ */ #include "php.h" #include "php_globals.h" @@ -461,15 +461,12 @@ stream->readpos = 0; stream->writepos = 0; } else if (status == PSFS_PASS_ON) { - /* Put any filtered data onto the readbuffer stack. - Previously read data has been at least partially consumed. */ - stream->readpos += consumed; - - if (stream->writepos == stream->readpos) { - /* Entirely consumed */ - stream->writepos = 0; - stream->readpos = 0; - } + /* If any data is consumed, we cannot rely upon the existing read buffer, + as the filtered data must replace the existing data, so invalidate the cache */ + /* note that changes here should be reflected in + main/streams/streams.c::php_stream_fill_read_buffer */ + stream->writepos = 0; + stream->readpos = 0; while (brig_outp->head) { bucket = brig_outp->head; http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.169&r2=1.170&diff_format=u Index: php-src/main/streams/streams.c diff -u php-src/main/streams/streams.c:1.169 php-src/main/streams/streams.c:1.170 --- php-src/main/streams/streams.c:1.169 Tue Aug 26 16:06:23 2008 +++ php-src/main/streams/streams.c Mon Sep 22 01:26:38 2008 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streams.c,v 1.169 2008/08/26 16:06:23 dsp Exp $ */ +/* $Id: streams.c,v 1.170 2008/09/22 01:26:38 cellog Exp $ */ #define _GNU_SOURCE #include "php.h" @@ -455,6 +455,10 @@ php_stream_bucket_brigade brig_in = { NULL, NULL }, brig_out = { NULL, NULL }; php_stream_bucket_brigade *brig_inp = &brig_in, *brig_outp = &brig_out, *brig_swap; + /* Invalidate the existing cache, otherwise reads can fail, see note in + main/streams/filter.c::_php_stream_filter_append */ + stream->writepos = stream->readpos = 0; + /* allocate a buffer for reading chunks */ chunk_buf = emalloc(stream->chunk_size);