tls: prevent multiple connection errors

onConnectEnd(), which is called by TLSSocket, has a guard to prevent being called multiple times, but it does not prevent the OpenSSL error handler from being called, leading to multiple error events. This commit adds that piece of missing logic. PR-URL: #23636 Fixes: #23631 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Wyatt Preul <[email protected]> Reviewed-By: James M Snell <[email protected]>
nodejs · Oct 30, 2018 · 81dc241 · 81dc241
1 parent 3ca41dc
commit 81dc241
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
@@ -250,9 +250,11 @@ function onocspresponse(resp) {
 function onerror(err) {
   const owner = this[owner_symbol];
 
-  if (owner._writableState.errorEmitted)
+  if (owner._hadError)
     return;
 
+  owner._hadError = true;
+
   // Destroy socket if error happened before handshake's finish
   if (!owner._secureEstablished) {
     // When handshake fails control is not yet released,
@@ -267,8 +269,6 @@ function onerror(err) {
     // Throw error
     owner._emitTLSError(err);
   }
-
-  owner._writableState.errorEmitted = true;
 }
 
 function initRead(tls, wrapped) {