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

nghttpx: Fix possible crash in rare case

This commit is contained in:
Tatsuhiro Tsujikawa 2016-03-15 00:46:15 +09:00
parent dd2bdf3e31
commit ab734f09b6
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/shrpx_http2_upstream.cc
View File

@ -1728,6 +1728,11 @@ int Http2Upstream::on_downstream_reset(bool no_retry) {
for (auto downstream = downstream_queue_.get_downstreams(); downstream; for (auto downstream = downstream_queue_.get_downstreams(); downstream;
downstream = downstream->dlnext) { downstream = downstream->dlnext) {
if (downstream->get_dispatch_state() != Downstream::DISPATCH_ACTIVE) { if (downstream->get_dispatch_state() != Downstream::DISPATCH_ACTIVE) {
// This is error condition when we failed push_request_headers()
// in initiate_downstream(). Otherwise, we have
// Downstream::DISPATCH_ACTIVE state, or we did not set
// DownstreamConnection.
downstream->pop_downstream_connection();
continue; continue;
} }

5
src/shrpx_spdy_upstream.cc
View File

@ -1224,6 +1224,11 @@ int SpdyUpstream::on_downstream_reset(bool no_retry) {
for (auto downstream = downstream_queue_.get_downstreams(); downstream; for (auto downstream = downstream_queue_.get_downstreams(); downstream;
downstream = downstream->dlnext) { downstream = downstream->dlnext) {
if (downstream->get_dispatch_state() != Downstream::DISPATCH_ACTIVE) { if (downstream->get_dispatch_state() != Downstream::DISPATCH_ACTIVE) {
// This is error condition when we failed push_request_headers()
// in initiate_downstream(). Otherwise, we have
// Downstream::DISPATCH_ACTIVE state, or we did not set
// DownstreamConnection.
downstream->pop_downstream_connection();
continue; continue;
} }