From 7d9eb17d30112b362567ea079323e557902ba8ec Mon Sep 17 00:00:00 2001 From: himself65 Date: Wed, 31 Jul 2019 22:20:13 +0800 Subject: [PATCH] http2: destroy when settingsFn throws an error http2.connect should call destroy when init fails. PR-URL: https://github.com/nodejs/node/pull/28908 Reviewed-By: Luigi Pinca Reviewed-By: Trivikram Kamat Reviewed-By: James M Snell Reviewed-By: Rich Trott --- lib/internal/http2/core.js | 8 +++++++- test/parallel/test-http2-connect.js | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js index aadacdcdc497c2..571ffaa8584007 100644 --- a/lib/internal/http2/core.js +++ b/lib/internal/http2/core.js @@ -976,7 +976,13 @@ class Http2Session extends EventEmitter { if (socket.connecting) { const connectEvent = socket instanceof tls.TLSSocket ? 'secureConnect' : 'connect'; - socket.once(connectEvent, setupFn); + socket.once(connectEvent, () => { + try { + setupFn(); + } catch (error) { + socket.destroy(error); + } + }); } else { setupFn(); } diff --git a/test/parallel/test-http2-connect.js b/test/parallel/test-http2-connect.js index a1291e3be956e1..4569905eac9be1 100644 --- a/test/parallel/test-http2-connect.js +++ b/test/parallel/test-http2-connect.js @@ -69,6 +69,20 @@ const { connect: netConnect } = require('net'); connect(authority).on('error', () => {}); } +// Check for error for init settings error +{ + createServer(function() { + connect(`http://localhost:${this.address().port}`, { + settings: { + maxFrameSize: 1 // An incorrect settings + } + }).on('error', expectsError({ + code: 'ERR_HTTP2_INVALID_SETTING_VALUE', + type: RangeError + })); + }); +} + // Check for error for an invalid protocol (not http or https) { const authority = 'ssh://localhost';