domain: don't crash on "throw null"

rlidwka · Dec 24, 2013 · 34f5c3c · 34f5c3c
1 parent 055f7e9
commit 34f5c3c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/lib/domain.js b/lib/domain.js
@@ -56,8 +56,10 @@ var listenerObj = {
     if (domain._disposed)
       return true;
 
-    er.domain = domain;
-    er.domainThrown = true;
+    if (util.isObject(er) || util.isFunction(er)) {
+      er.domain = domain;
+      er.domainThrown = true;
+    }
     // wrap this in a try/catch so we don't get infinite throwing
     try {
       // One of three things will happen here.

diff --git a/test/simple/test-domain.js b/test/simple/test-domain.js
@@ -261,3 +261,20 @@ assert.equal(result, 'return value');
 var fst = fs.createReadStream('stream for nonexistent file')
 d.add(fst)
 expectCaught++;
+
+
+;[42, /*NaN,*/ null, undefined, function(){}, 'string'].forEach(function(something) {
+  var d = new domain.Domain();
+  d.run(function() {
+    process.nextTick(function() {
+      throw something;
+    });
+    expectCaught++;
+  });
+
+  d.on('error', function(er) {
+    assert.strictEqual(something, er);
+    caught++;
+  });
+});
+