From: Stefan Eissing <icing@apache.org>
Date: Mon, 23 May 2016 12:44:02 +0000 (+0000)
Subject: merge of r1745175 from trunk:
X-Git-Tag: 2.4.21~135
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa43484f2b3d77c6c182ebfacd84a5d74385465c;p=apache

merge of r1745175 from trunk:

mod_http2: fix for possible null pointer deref on aborted bucket beam.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1745176 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/http2/h2_bucket_beam.c b/modules/http2/h2_bucket_beam.c
index d648b1d159..6b32e9beab 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;
diff --git a/modules/http2/mod_h2.h b/modules/http2/mod_h2.h
deleted file mode 100644
index bb895dd2f1..0000000000
--- a/modules/http2/mod_h2.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef mod_h2_mod_h2_h
-#define mod_h2_mod_h2_h
-
-#endif