http2: destroy when settingsFn throws an error

himself65 · Trott · commit 2b03e1d0a5ef · 2019-08-02T12:02:48.000-07:00
http2.connect should call destroy when init fails. PR-URL: #28908 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js
@@ -972,7 +972,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
@@ -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';
