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.
This commit is contained in:
Ben Noordhuis 2012-07-12 18:16:57 +02:00
Родитель 5d97d72753
Коммит 3a6314dbe1
3 изменённых файлов: 42 добавлений и 0 удалений

Просмотреть файл

@ -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;
}

Просмотреть файл

@ -104,6 +104,9 @@ Handle<Value> 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();

Просмотреть файл

@ -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++;
}