summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBert Belder <bertbelder@gmail.com>2012-11-09 00:49:24 +0100
committerBert Belder <bertbelder@gmail.com>2012-11-09 00:49:24 +0100
commitb3bfb6fbb6ef51163f3db35d1057d277b2dd05fc (patch)
tree5632260ea2d92c894c4acca804d03ec24d4233c2 /src
parent9b22944b68a91dc41015022679779472c75d4e9b (diff)
downloadnode-b3bfb6fbb6ef51163f3db35d1057d277b2dd05fc.tar.gz
domains: don't crash if domain is set to null
Closes #4256
Diffstat (limited to 'src')
-rw-r--r--src/node.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/node.cc b/src/node.cc
index b86961fde..3d4008e5a 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -1020,7 +1020,7 @@ MakeCallback(const Handle<Object> object,
Local<Object> domain;
Local<Function> enter;
Local<Function> exit;
- if (!domain_v->IsUndefined()) {
+ if (domain_v->IsObject()) {
domain = domain_v->ToObject();
if (domain->Get(disposed_symbol)->BooleanValue()) {
// domain has been disposed of.
@@ -1042,7 +1042,7 @@ MakeCallback(const Handle<Object> object,
return Undefined();
}
- if (!domain_v->IsUndefined()) {
+ if (domain_v->IsObject()) {
exit = Local<Function>::Cast(domain->Get(exit_symbol));
exit->Call(domain, 0, NULL);
}