pollita Wed Oct 11 23:11:26 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/main/streams filter.c Log: MFH(r-1.38) 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.17.2.3.2.2&r2=1.17.2.3.2.3&diff_format=u Index: php-src/main/streams/filter.c diff -u php-src/main/streams/filter.c:1.17.2.3.2.2 php-src/main/streams/filter.c:1.17.2.3.2.3 --- php-src/main/streams/filter.c:1.17.2.3.2.2 Tue Oct 3 19:51:01 2006 +++ php-src/main/streams/filter.c Wed Oct 11 23:11:26 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filter.c,v 1.17.2.3.2.2 2006/10/03 19:51:01 iliaa Exp $ */ +/* $Id: filter.c,v 1.17.2.3.2.3 2006/10/11 23:11:26 pollita Exp $ */ #include "php.h" #include "php_globals.h" @@ -224,12 +224,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