Skip to content

Commit

Permalink
async-hooks,net: ensure asyncId=null if no handle
Browse files Browse the repository at this point in the history
If the .listen() hasn't been called on the server, there is no handle
object. In this case use null as the triggerAsyncId.

Fixes: #13548
PR-URL: #13938
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Reviewed-By: Andreas Madsen <amwebdk@gmail.com>
  • Loading branch information
Matt Sergeant authored and addaleax committed Jul 18, 2017
1 parent 2eabd92 commit 86c06c0
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lib/net.js
Original file line number Diff line number Diff line change
Expand Up @@ -1558,7 +1558,8 @@ Server.prototype.getConnections = function(cb) {
const self = this;

function end(err, connections) {
nextTick(self[async_id_symbol], cb, err, connections);
const asyncId = self._handle ? self[async_id_symbol] : null;
nextTick(asyncId, cb, err, connections);
}

if (!this._usingSlaves) {
Expand Down
11 changes: 11 additions & 0 deletions test/async-hooks/test-net-get-connections.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
'use strict';

const common = require('../common');
const net = require('net');
const server = net.createServer();

// This test was based on an error raised by Haraka.
// It caused server.getConnections to raise an exception.
// Ref: https://github.com/haraka/Haraka/pull/1951

server.getConnections(common.mustCall());

0 comments on commit 86c06c0

Please sign in to comment.