From dee250fd77e6f57aa28f6937355f8040399c2d8d Mon Sep 17 00:00:00 2001 From: Anatoli Papirovski Date: Tue, 5 Jun 2018 20:34:47 -0400 Subject: [PATCH] http2: safer Http2Session destructor It's hypothetically (and with certain V8 flags) possible for the session to be garbage collected before all the streams are. In that case, trying to remove the stream from the session will lead to a segfault due to attempting to access no longer valid memory. Fix this by unsetting the session on any streams still around when destroying. PR-URL: https://github.com/nodejs/node/pull/21194 Reviewed-By: Anna Henningsen Reviewed-By: Ujjwal Sharma --- src/node_http2.cc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/node_http2.cc b/src/node_http2.cc index be231f1f24092b..1102ebf98d7f75 100644 --- a/src/node_http2.cc +++ b/src/node_http2.cc @@ -499,8 +499,8 @@ Http2Session::Http2Session(Environment* env, Http2Session::~Http2Session() { CHECK_EQ(flags_ & SESSION_STATE_HAS_SCOPE, 0); Debug(this, "freeing nghttp2 session"); - for (const auto& iter : streams_) - iter.second->session_ = nullptr; + for (const auto& stream : streams_) + stream.second->session_ = nullptr; nghttp2_session_del(session_); } @@ -1710,11 +1710,11 @@ Http2Stream::Http2Stream( Http2Stream::~Http2Stream() { + if (session_ == nullptr) + return; Debug(this, "tearing down stream"); - if (session_ != nullptr) { - session_->RemoveStream(this); - session_ = nullptr; - } + session_->RemoveStream(this); + session_ = nullptr; } std::string Http2Stream::diagnostic_name() const { @@ -1789,7 +1789,8 @@ void Http2Stream::Destroy() { // We can destroy the stream now if there are no writes for it // already on the socket. Otherwise, we'll wait for the garbage collector // to take care of cleaning up. - if (!stream->session()->HasWritesOnSocketForStream(stream)) + if (stream->session() == nullptr || + !stream->session()->HasWritesOnSocketForStream(stream)) delete stream; }, this, this->object());