From: Stefan Eissing <icing@apache.org>
Date: Mon, 23 May 2016 12:37:53 +0000 (+0000)
Subject: mod_http2: fix possible null pointer deref in bucket beams on receive
X-Git-Tag: 2.5.0-alpha~1578
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4f6898662222e0d19fb18362f91d9f66b55d97a;p=thirdparty%2Fapache%2Fhttpd.git

mod_http2: fix possible null pointer deref in bucket beams on receive

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

diff --git a/modules/http2/h2_bucket_beam.c b/modules/http2/h2_bucket_beam.c
index d648b1d159d..6b32e9beaba 100644
--- a/modules/http2/h2_bucket_beam.c
+++ b/modules/http2/h2_bucket_beam.c
@@ -738,7 +738,7 @@ apr_status_t h2_beam_receive(h2_bucket_beam *beam,
     if (enter_yellow(beam, &bl) == APR_SUCCESS) {
 transfer:
         if (beam->aborted) {
-            if (!APR_BRIGADE_EMPTY(beam->green)) {
+            if (beam->green && !APR_BRIGADE_EMPTY(beam->green)) {
                 apr_brigade_cleanup(beam->green);
             }
             status = APR_ECONNABORTED;