Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1743788 - /httpd/httpd/trunk/modules/http2/h2_proxy_session.c
Date: Sat, 14 May 2016 06:23:26 -0000
To: cvs@httpd.apache.org
From: jailletc36@apache.org
Message-Id: <20160514062326.783C23A0051@svn01-us-west.apache.org>
archived-at: Sat, 14 May 2016 06:23:32 -0000

Author: jailletc36
Date: Sat May 14 06:23:25 2016
New Revision: 1743788

URL: http://svn.apache.org/viewvc?rev=1743788&view=rev
Log:
Fix NULL pointer dereference

Modified:
    httpd/httpd/trunk/modules/http2/h2_proxy_session.c

Modified: httpd/httpd/trunk/modules/http2/h2_proxy_session.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_proxy_session.c?rev=1743788&r1=1743787&r2=1743788&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_proxy_session.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_proxy_session.c Sat May 14 06:23:25 2016
@@ -336,10 +336,10 @@ static int on_data_chunk_recv(nghttp2_se
     
     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_
     *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;
     }