http: fix ClientRequest unhandled errors

ClientRequest could someone cause an unhandled error from socket. Fixes: #36931 PR-URL: #36970 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>

Author: ronag

lib/_http_client.js

@@ -801,13 +801,15 @@ function onSocketNT(req, socket, err) {
  req.emit('close');
  }
 
- if (!err && req.agent) {
- socket?.emit('free');
- } else if (socket) {
- finished(socket.destroy(err || req[kError]), (er) => {
- _destroy(req, er || err);
- });
- return;
+ if (socket) {
+ if (!err && req.agent && !socket.destroyed) {
+ socket.emit('free');
+ } else {
+ finished(socket.destroy(err || req[kError]), (er) => {
+ _destroy(req, er || err);
+ });
+ return;
+ }
  }
 
  _destroy(req, err || req[kError]);

test/parallel/test-http-client-abort3.js

@@ -0,0 +1,32 @@
+'use strict';
+
+const common = require('../common');
+const http = require('http');
+const net = require('net');
+
+function createConnection() {
+ const socket = new net.Socket();
+
+ process.nextTick(function() {
+ socket.destroy(new Error('Oops'));
+ });
+
+ return socket;
+}
+
+{
+ const req = http.get({ createConnection });
+
+ req.on('error', common.expectsError({ name: 'Error', message: 'Oops' }));
+ req.abort();
+}
+
+{
+ class CustomAgent extends http.Agent {}
+ CustomAgent.prototype.createConnection = createConnection;
+
+ const req = http.get({ agent: new CustomAgent() });
+
+ req.on('error', common.expectsError({ name: 'Error', message: 'Oops' }));
+ req.abort();
+}