Skip to content

Commit

Permalink
http2: check write not scheduled in scope destructor
Browse files Browse the repository at this point in the history
Fixes: #33156

PR-URL: #36241
Backport-PR-URL: #36372
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
  • Loading branch information
davedoesdev authored and BethGriggs committed Dec 10, 2020
1 parent c44b478 commit 4b315a5
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/node_http2.cc
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ Http2Scope::Http2Scope(Http2Session* session) : session_(session) {
Http2Scope::~Http2Scope() {
if (!session_) return;
session_->set_in_scope(false);
session_->MaybeScheduleWrite();
if (!session_->is_write_scheduled())
session_->MaybeScheduleWrite();
}

// The Http2Options object is used during the construction of Http2Session
Expand Down
46 changes: 46 additions & 0 deletions test/parallel/test-http2-close-while-writing.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
'use strict';
// https://github.com/nodejs/node/issues/33156
const common = require('../common');
const fixtures = require('../common/fixtures');

if (!common.hasCrypto) {
common.skip('missing crypto');
}

const http2 = require('http2');

const key = fixtures.readKey('agent8-key.pem', 'binary');
const cert = fixtures.readKey('agent8-cert.pem', 'binary');
const ca = fixtures.readKey('fake-startcom-root-cert.pem', 'binary');

const server = http2.createSecureServer({
key,
cert,
maxSessionMemory: 1000
});

let client_stream;

server.on('session', common.mustCall(function(session) {
session.on('stream', common.mustCall(function(stream) {
stream.resume();
stream.on('data', function() {
this.write(Buffer.alloc(1));
process.nextTick(() => client_stream.destroy());
});
}));
}));

server.listen(0, function() {
const client = http2.connect(`https://localhost:${server.address().port}`, {
ca,
maxSessionMemory: 1000
});
client_stream = client.request({ ':method': 'POST' });
client_stream.on('close', common.mustCall(() => {
client.close();
server.close();
}));
client_stream.resume();
client_stream.write(Buffer.alloc(64 * 1024));
});

0 comments on commit 4b315a5

Please sign in to comment.