From: Christophe Jaillet <jailletc36@apache.org>
Date: Sat, 14 May 2016 06:23:25 +0000 (+0000)
Subject: Fix NULL pointer dereference
X-Git-Tag: 2.5.0-alpha~1624
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=337ec932b03a7f48134728d2a3d4d6d279d91802;p=thirdparty%2Fapache%2Fhttpd.git

Fix NULL pointer dereference

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

diff --git a/modules/http2/h2_proxy_session.c b/modules/http2/h2_proxy_session.c
index d78e3eb5e3d..17321024e7f 100644
--- a/modules/http2/h2_proxy_session.c
+++ b/modules/http2/h2_proxy_session.c
@@ -336,10 +336,10 @@ static int on_data_chunk_recv(nghttp2_session *ngh2, uint8_t flags,
     
     stream = nghttp2_session_get_stream_user_data(ngh2, stream_id);
     if (!stream) {
-        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, stream->r, APLOGNO(03358)
-                      "h2_proxy_session(%s): recv data chunk for "
-                      "unknown stream %d, ignored", 
-                      session->id, stream_id);
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(03358)
+                     "h2_proxy_session(%s): recv data chunk for "
+                     "unknown stream %d, ignored", 
+                     session->id, stream_id);
         return 0;
     }
     
@@ -422,9 +422,9 @@ static ssize_t stream_data_read(nghttp2_session *ngh2, int32_t stream_id,
     *data_flags = 0;
     stream = nghttp2_session_get_stream_user_data(ngh2, stream_id);
     if (!stream) {
-        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, stream->r, APLOGNO(03361)
-                      "h2_proxy_stream(%s): data_read, stream %d not found", 
-                      stream->session->id, stream_id);
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(03361)
+                     "h2_proxy_stream(%s): data_read, stream %d not found", 
+                     stream->session->id, stream_id);
         return NGHTTP2_ERR_CALLBACK_FAILURE;
     }