MFH(r-1.38) Bugfix 38648: Don't assume all buckets are part of a brigade

sgolemon · sgolemon · commit d8fc0ccfe146 · 2006-10-11T23:11:26.000Z
diff --git a/main/streams/filter.c b/main/streams/filter.c
@@ -224,12 +224,12 @@ PHPAPI void php_stream_bucket_unlink(php_stream_bucket *bucket TSRMLS_DC)
 {
 	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;

Original file line number	Diff line number	Diff line change
`@@ -224,12 +224,12 @@ PHPAPI void php_stream_bucket_unlink(php_stream_bucket *bucket TSRMLS_DC)`
`224`	`224`	`{`
`225`	`225`	`if (bucket->prev) {`
`226`	`226`	`bucket->prev->next = bucket->next;`
`227`		`- } else {`
	`227`	`+ } else if (bucket->brigade) {`
`228`	`228`	`bucket->brigade->head = bucket->next;`
`229`	`229`	`}`
`230`	`230`	`if (bucket->next) {`
`231`	`231`	`bucket->next->prev = bucket->prev;`
`232`		`- } else {`
	`232`	`+ } else if (bucket->brigade) {`
`233`	`233`	`bucket->brigade->tail = bucket->prev;`
`234`	`234`	`}`
`235`	`235`	`bucket->brigade = NULL;`