http: fix undefined error in parser event

The current check for socket.server[kIncomingMessage] does not account for the possibility of a socket.server that doesn't have that property defined. Fix it. PR-URL: #20029 Fixes: #19231 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Khaidi Chu <[email protected]>
nodejs · Apr 17, 2018 · 95fafc0 · 95fafc0
1 parent 4f2000f
commit 95fafc0
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/lib/_http_common.js b/lib/_http_common.js
@@ -62,7 +62,8 @@ function parserOnHeaders(headers, url) {
 function parserOnHeadersComplete(versionMajor, versionMinor, headers, method,
                                  url, statusCode, statusMessage, upgrade,
                                  shouldKeepAlive) {
-  var parser = this;
+  const parser = this;
+  const { socket } = parser;
 
   if (!headers) {
     headers = parser._headers;
@@ -75,10 +76,11 @@ function parserOnHeadersComplete(versionMajor, versionMinor, headers, method,
   }
 
   // Parser is also used by http client
-  var ParserIncomingMessage = parser.socket && parser.socket.server ?
-    parser.socket.server[kIncomingMessage] : IncomingMessage;
+  const ParserIncomingMessage = (socket && socket.server &&
+                                 socket.server[kIncomingMessage]) ||
+                                 IncomingMessage;
 
-  parser.incoming = new ParserIncomingMessage(parser.socket);
+  parser.incoming = new ParserIncomingMessage(socket);
   parser.incoming.httpVersionMajor = versionMajor;
   parser.incoming.httpVersionMinor = versionMinor;
   parser.incoming.httpVersion = `${versionMajor}.${versionMinor}`;