walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

in nghttp2_session_send() data is declared uninitialized and used 

after a call to nghttp2_session_mem_send_internal() which should
set it, however in nghttp2_session_mem_send_internal() it is
possible to return before setting the pointer.

This change initializes the variable to NULL where delcared and
sets the variable in nghttp2_session_mem_send_internal() to
NULL before possibly returning rather than after.

both options are not necessary but are both ideal practice
This commit is contained in:
Mike Conlen 2016-04-21 22:53:19 +00:00
parent 68059ccda9
commit e04e24c1c2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/nghttp2_session.c
View File

@ -2877,6 +2877,7 @@ static ssize_t nghttp2_session_mem_send_internal(nghttp2_session *session,
aob = &session->aob; aob = &session->aob;
framebufs = &aob->framebufs; framebufs = &aob->framebufs;
*data_ptr = NULL;
/* We may have idle streams more than we expect (e.g., /* We may have idle streams more than we expect (e.g.,
nghttp2_session_change_stream_priority() or nghttp2_session_change_stream_priority() or
nghttp2_session_create_idle_stream()). Adjust them here. */ nghttp2_session_create_idle_stream()). Adjust them here. */
@ -2885,7 +2886,6 @@ static ssize_t nghttp2_session_mem_send_internal(nghttp2_session *session,
return rv; return rv;
} }
*data_ptr = NULL;
for (;;) { for (;;) {
switch (aob->state) { switch (aob->state) {
case NGHTTP2_OB_POP_ITEM: { case NGHTTP2_OB_POP_ITEM: {
@ -3163,7 +3163,7 @@ ssize_t nghttp2_session_mem_send(nghttp2_session *session,
} }
int nghttp2_session_send(nghttp2_session *session) { int nghttp2_session_send(nghttp2_session *session) {
const uint8_t *data; const uint8_t *data = NULL;
ssize_t datalen; ssize_t datalen;
ssize_t sentlen; ssize_t sentlen;
nghttp2_bufs *framebufs; nghttp2_bufs *framebufs;