Skip to content

Commit 29bcd47

Browse files
daeyeondanielleadams
authored andcommitted
net: fix socket._getpeername
Fixes: #43009 If calling `this._handle.getpeername` returns an error at the first call, its result shouldn't be cached to `this._peername`. Signed-off-by: Daeyeon Jeong [email protected] PR-URL: #43010 Reviewed-By: Paolo Insogna <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Zeyu "Alex" Yang <[email protected]>
1 parent 781d5e5 commit 29bcd47

File tree

2 files changed

+27
-3
lines changed

2 files changed

+27
-3
lines changed

lib/net.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -785,9 +785,10 @@ Socket.prototype._getpeername = function() {
785785
if (!this._handle || !this._handle.getpeername || this.connecting) {
786786
return this._peername || {};
787787
} else if (!this._peername) {
788-
this._peername = {};
789-
// FIXME(bnoordhuis) Throw when the return value is not 0?
790-
this._handle.getpeername(this._peername);
788+
const out = {};
789+
const err = this._handle.getpeername(out);
790+
if (err) return out;
791+
this._peername = out;
791792
}
792793
return this._peername;
793794
};
+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
'use strict';
2+
3+
const common = require('../common');
4+
const net = require('net');
5+
const { strictEqual } = require('assert');
6+
7+
const server = net.createServer();
8+
9+
server.listen(common.mustCall(function() {
10+
const socket = net.connect({ port: server.address().port });
11+
12+
strictEqual(socket.connecting, true);
13+
strictEqual(socket.remoteAddress, undefined);
14+
15+
socket.on('connect', common.mustCall(function() {
16+
strictEqual(socket.remoteAddress !== undefined, true);
17+
socket.end();
18+
}));
19+
20+
socket.on('end', common.mustCall(function() {
21+
server.close();
22+
}));
23+
}));

0 commit comments

Comments
 (0)