From b94ce575f57fa883b93ce8948730577a9bde8603 Mon Sep 17 00:00:00 2001 From: cjihrig Date: Sat, 13 Oct 2018 00:59:35 -0400 Subject: [PATCH] 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: https://github.com/nodejs/node/pull/23636 Fixes: https://github.com/nodejs/node/issues/23631 Reviewed-By: Anna Henningsen Reviewed-By: Wyatt Preul Reviewed-By: James M Snell --- lib/_tls_wrap.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js index fb9662c922956f..b28e3b62b74daf 100644 --- a/lib/_tls_wrap.js +++ b/lib/_tls_wrap.js @@ -248,9 +248,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, @@ -265,8 +267,6 @@ function onerror(err) { // Throw error owner._emitTLSError(err); } - - owner._writableState.errorEmitted = true; } function initRead(tls, wrapped) {