diff options
| author | Christophe Jaillet <jailletc36@apache.org> | 2016-05-14 08:23:25 +0200 |
|---|---|---|
| committer | Christophe Jaillet <jailletc36@apache.org> | 2016-05-14 08:23:25 +0200 |
| commit | 337ec932b03a7f48134728d2a3d4d6d279d91802 (patch) | |
| tree | 191e4219cc4274f9e5a5d840fe0ecaed0c907939 /modules | |
| parent | Avoid truncating the_request line when there is no request to 'W'rite. (diff) | |
| download | apache2-337ec932b03a7f48134728d2a3d4d6d279d91802.tar.xz apache2-337ec932b03a7f48134728d2a3d4d6d279d91802.zip | |
Fix NULL pointer dereference
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1743788 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/http2/h2_proxy_session.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/http2/h2_proxy_session.c b/modules/http2/h2_proxy_session.c index d78e3eb5e3..17321024e7 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; } |