From 3a6314dbe159c40aa4cd95786bf55f6dcd0580bb Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Thu, 12 Jul 2012 18:16:57 +0200 Subject: [PATCH] net: fix net.Server.listen({fd:x}) error reporting * don't assert when fd isn't an open file descriptor * don't die with a ReferenceError when fd isn't a file descriptor you can listen() on Fixes #3699. --- lib/net.js | 1 + src/tty_wrap.cc | 3 +++ test/simple/test-listen-fd-ebadf.js | 38 +++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 test/simple/test-listen-fd-ebadf.js diff --git a/lib/net.js b/lib/net.js index f129c0cce7b..f5d3ebdd22f 100644 --- a/lib/net.js +++ b/lib/net.js @@ -851,6 +851,7 @@ var createServerHandle = exports._createServerHandle = default: // Not a fd we can listen on. This will trigger an error. debug('listen invalid fd=' + fd + ' type=' + type); + global.errno = 'EINVAL'; // hack, callers expect that errno is set handle = null; break; } diff --git a/src/tty_wrap.cc b/src/tty_wrap.cc index f1a189c91e4..fde87175956 100644 --- a/src/tty_wrap.cc +++ b/src/tty_wrap.cc @@ -104,6 +104,9 @@ Handle TTYWrap::GuessHandleType(const Arguments& args) { case UV_FILE: return scope.Close(String::New("FILE")); + case UV_UNKNOWN_HANDLE: + return scope.Close(String::New("UNKNOWN")); + default: assert(0); return v8::Undefined(); diff --git a/test/simple/test-listen-fd-ebadf.js b/test/simple/test-listen-fd-ebadf.js new file mode 100644 index 00000000000..6c0f20ae436 --- /dev/null +++ b/test/simple/test-listen-fd-ebadf.js @@ -0,0 +1,38 @@ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +var common = require('../common'); +var assert = require('assert'); +var net = require('net'); + +var gotError = 0; + +process.on('exit', function() { + assert.equal(gotError, 2); +}); + +net.createServer(assert.fail).listen({fd:2}).on('error', onError); +net.createServer(assert.fail).listen({fd:42}).on('error', onError); + +function onError(ex) { + assert.equal(ex.code, 'EINVAL'); + gotError++; +}