From 110d99c661c6a2dd4e7ec87c3aa7b2b649e5fa79 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 24 Aug 2015 11:26:30 +0200 Subject: http2: on_frame_recv: get a proper 'conn' for the debug logging "Explicit null dereferenced (FORWARD_NULL)" Coverity CID 1317366 --- lib/http2.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/http2.c b/lib/http2.c index 0024add8a..197d05c05 100644 --- a/lib/http2.c +++ b/lib/http2.c @@ -373,7 +373,7 @@ static int push_promise(struct SessionHandle *data, static int on_frame_recv(nghttp2_session *session, const nghttp2_frame *frame, void *userp) { - struct connectdata *conn = NULL; + struct connectdata *conn = (struct connectdata *)userp; struct http_conn *httpc = NULL; struct SessionHandle *data_s = NULL; struct HTTP *stream = NULL; @@ -382,8 +382,6 @@ static int on_frame_recv(nghttp2_session *session, const nghttp2_frame *frame, size_t left, ncopy; int32_t stream_id = frame->hd.stream_id; - (void)userp; - if(!stream_id) { /* stream ID zero is for connection-oriented stuff */ return 0; -- cgit v1.2.3