From bddb4de9469baa50f70dfa3c3c7d49c85345ff42 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Thu, 3 Oct 2013 22:51:58 +0900 Subject: [PATCH] Fix data_stream_id and data_flags are not assigned --- lib/nghttp2_session.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/nghttp2_session.c b/lib/nghttp2_session.c index 21dfdfb0..1f39eb44 100644 --- a/lib/nghttp2_session.c +++ b/lib/nghttp2_session.c @@ -3099,6 +3099,9 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, memcpy(session->iframe.buf+session->iframe.off, inmark, readlen); } } else { + data_stream_id = nghttp2_get_uint32(&session->iframe.headbuf[4]) & + NGHTTP2_STREAM_ID_MASK; + data_flags = session->iframe.headbuf[3]; } session->iframe.off += readlen; inmark += readlen; @@ -3132,9 +3135,6 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, } /* For data frame, We don't buffer data. Instead, just pass received data to callback function. */ - data_stream_id = nghttp2_get_uint32(&session->iframe.headbuf[4]) & - NGHTTP2_STREAM_ID_MASK; - data_flags = session->iframe.headbuf[3]; if(session->iframe.state != NGHTTP2_RECV_PAYLOAD_IGN) { if(session->callbacks.on_data_chunk_recv_callback) { r = session->callbacks.on_data_chunk_recv_callback