net: only defer _final call when connecting

jazelly · web-flow · commit c15bafdaf4ea · 2023-05-08T07:47:48.000Z
Fixes: #47322 PR-URL: #47385 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Robert Nagy <ronagy@icloud.com>
diff --git a/lib/net.js b/lib/net.js
@@ -508,7 +508,7 @@ Socket.prototype._unrefTimer = function _unrefTimer() {
 // sent out to the other side.
 Socket.prototype._final = function(cb) {
   // If still connecting - defer handling `_final` until 'connect' will happen
-  if (this.pending) {
+  if (this.connecting) {
     debug('_final: not yet connected');
     return this.once('connect', () => this._final(cb));
   }
diff --git a/test/parallel/test-net-end-without-connect.js b/test/parallel/test-net-end-without-connect.js
@@ -20,8 +20,11 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 'use strict';
-require('../common');
+const common = require('../common');
 const net = require('net');
+const assert = require('assert');
 
 const sock = new net.Socket();
-sock.end();  // Should not throw.
+sock.end(common.mustCall(() => {
+  assert.strictEqual(sock.writable, false);
+}));

Original file line number	Diff line number	Diff line change
`@@ -508,7 +508,7 @@ Socket.prototype._unrefTimer = function _unrefTimer() {`
`508`	`508`	`// sent out to the other side.`
`509`	`509`	`Socket.prototype._final = function(cb) {`
`510`	`510`	// If still connecting - defer handling `_final` until 'connect' will happen
`511`		`- if (this.pending) {`
	`511`	`+ if (this.connecting) {`
`512`	`512`	`debug('_final: not yet connected');`
`513`	`513`	`return this.once('connect', () => this._final(cb));`
`514`	`514`	`}`