]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
mod_http2: fix possible null pointer deref in bucket beams on receive
authorStefan Eissing <icing@apache.org>
Mon, 23 May 2016 12:37:53 +0000 (12:37 +0000)
committerStefan Eissing <icing@apache.org>
Mon, 23 May 2016 12:37:53 +0000 (12:37 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1745175 13f79535-47bb-0310-9956-ffa450edef68

modules/http2/h2_bucket_beam.c

index d648b1d159db02b3ab93aec5b7b777cf7a2040a9..6b32e9beaba553734ac2f9714a8e10fe43486ae2 100644 (file)
@@ -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;