1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dgram: fix abort when getting fd of closed dgram

Browse Source 
v8's `messages.js` file's `CallSiteGetMethodName` is running through all
object properties and getter to figure out method name of function that
appears in stack trace. This run-through will also read `fd` property of
`UDPWrap` instance's javascript object, making `UNWRAP()` fail.

As a simple alternative to the test case above, one could just keep
reference to the dgram handle and try accessing `handle.fd` after it has
been fully closed.

fix #6536
This commit is contained in:
Fedor Indutny 2013-11-19 11:38:48 +04:00
parent 1394d5856b
commit 5ce50ece16
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/udp_wrap.cc
View File

@ -144,7 +144,7 @@ Handle<Value> UDPWrap::GetFD(Local<String>, const AccessorInfo& args) {
return v8::Null(); return v8::Null();
#else #else
HandleScope scope; HandleScope scope;
UNWRAP(UDPWrap) UNWRAP_NO_ABORT(UDPWrap)
int fd = (wrap == NULL) ? -1 : wrap->handle_.io_watcher.fd; int fd = (wrap == NULL) ? -1 : wrap->handle_.io_watcher.fd;
return scope.Close(Integer::New(fd)); return scope.Close(Integer::New(fd));
#endif #endif

9
test/simple/test-dgram-close.js
View File

@ -30,5 +30,14 @@ var buf = new Buffer(1024);
buf.fill(42); buf.fill(42);
var socket = dgram.createSocket('udp4'); var socket = dgram.createSocket('udp4');
var handle = socket._handle;
socket.send(buf, 0, buf.length, common.PORT, 'localhost'); socket.send(buf, 0, buf.length, common.PORT, 'localhost');
socket.close(); socket.close();
socket = null;
// Verify that accessing handle after closure doesn't throw
setImmediate(function() {
setImmediate(function() {
console.log('Handle fd is: ', handle.fd);
});
});