From: Graham Leggett <minfrin@apache.org>
Date: Fri, 4 Mar 2011 19:07:22 +0000 (+0000)
Subject: mod_cache_disk: Prevent a segfault should we receive a further bucket after
X-Git-Tag: 2.3.12~281
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bb3c4b8a98b7d2ad620e3c4d6a7bd75e2ac6310;p=thirdparty%2Fapache%2Fhttpd.git

mod_cache_disk: Prevent a segfault should we receive a further bucket after
we have committed the cached entry.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1078104 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/cache/mod_cache_disk.c b/modules/cache/mod_cache_disk.c
index 4d5fef2a6c1..3b14a24c895 100644
--- a/modules/cache/mod_cache_disk.c
+++ b/modules/cache/mod_cache_disk.c
@@ -1097,7 +1097,7 @@ static apr_status_t store_body(cache_handle_t *h, request_rec *r,
         e = APR_BRIGADE_FIRST(in);
 
         /* are we done completely? if so, pass any trailing buckets right through */
-        if (dobj->done) {
+        if (dobj->done || !dobj->data.pool) {
             APR_BUCKET_REMOVE(e);
             APR_BRIGADE_INSERT_TAIL(out, e);
             continue;