quic: fixup ResetStream

cancel stream buffer after sending reset to avoid segfault PR-URL: #341 Reviewed-By: Anna Henningsen <anna@addaleax.net>
nodejs · Feb 12, 2020 · 32c587d · 32c587d
1 parent 29740b2
commit 32c587d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/quic/node_quic_stream-inl.h b/src/quic/node_quic_stream-inl.h
@@ -133,10 +133,11 @@ void QuicStream::ResetStream(uint64_t app_error_code) {
   // streambuf_ will be canceled, and all data pending
   // to be acknowledged at the ngtcp2 level will be
   // abandoned.
+  BaseObjectPtr<QuicSession> ptr(session_);
   set_flag(QUICSTREAM_FLAG_READ_CLOSED);
+  session_->ResetStream(stream_id_, app_error_code);
   streambuf_.Cancel();
   streambuf_.End();
-  session_->ResetStream(stream_id_, app_error_code);
 }
 
 void QuicStream::Schedule(Queue* queue) {

diff --git a/test/parallel/test-quic-quicstream-close-early.js b/test/parallel/test-quic-quicstream-close-early.js
@@ -86,9 +86,6 @@ server.on('ready', common.mustCall(() => {
 
     const stream = req.openStream();
 
-    // TODO(@jasnell): The close happens synchronously, before any
-    // data for the stream is actually flushed out to the connected
-    // peer.
     stream.write('hello', common.mustCall());
     stream.close(1);