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

Fix crash

This commit is contained in:
Tatsuhiro Tsujikawa 2014-08-09 18:41:08 +09:00
parent 4c3aa081a0
commit 4679188069
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/nghttp2_session.c
View File

@ -2118,6 +2118,10 @@ static int session_after_frame_sent(nghttp2_session *session)
} }
if(data_frame->hd.flags & NGHTTP2_FLAG_END_STREAM) { if(data_frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
int stream_closed;
stream_closed =
(stream->shut_flags & NGHTTP2_SHUT_RDWR) == NGHTTP2_SHUT_RDWR;
nghttp2_stream_shutdown(stream, NGHTTP2_SHUT_WR); nghttp2_stream_shutdown(stream, NGHTTP2_SHUT_WR);
@ -2126,6 +2130,9 @@ static int session_after_frame_sent(nghttp2_session *session)
return rv; return rv;
} }
/* stream may be NULL if it was closed */ /* stream may be NULL if it was closed */
if(stream_closed) {
stream = NULL;
}
} }
} }
/* If session is closed or RST_STREAM was queued, we won't send /* If session is closed or RST_STREAM was queued, we won't send
@ -2134,6 +2141,15 @@ static int session_after_frame_sent(nghttp2_session *session)
nghttp2_session_predicate_data_send(session, nghttp2_session_predicate_data_send(session,
data_frame->hd.stream_id) != 0) { data_frame->hd.stream_id) != 0) {
if(stream) {
rv = nghttp2_stream_detach_data(stream, &session->ob_pq,
session->last_cycle);
if(nghttp2_is_fatal(rv)) {
return rv;
}
}
active_outbound_item_reset(aob); active_outbound_item_reset(aob);
return 0; return 0;