pollita Wed Oct 11 23:07:31 2006 UTC
Modified files:
/php-src/main/streams filter.c
Log:
Bugfix 38648: Don't assume all buckets are part of a brigade
http://cvs.php.net/viewvc.cgi/php-src/main/streams/filter.c?r1=1.37&r2=1.38&diff_format=u
Index: php-src/main/streams/filter.c
diff -u php-src/main/streams/filter.c:1.37 php-src/main/streams/filter.c:1.38
--- php-src/main/streams/filter.c:1.37 Sun Oct 8 13:34:24 2006
+++ php-src/main/streams/filter.c Wed Oct 11 23:07:30 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filter.c,v 1.37 2006/10/08 13:34:24 bjori Exp $ */
+/* $Id: filter.c,v 1.38 2006/10/11 23:07:30 pollita Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -281,12 +281,12 @@
{
if (bucket->prev) {
bucket->prev->next = bucket->next;
- } else {
+ } else if (bucket->brigade) {
bucket->brigade->head = bucket->next;
}
if (bucket->next) {
bucket->next->prev = bucket->prev;
- } else {
+ } else if (bucket->brigade) {
bucket->brigade->tail = bucket->prev;
}
bucket->brigade = NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
