[issue-1568][bug]: make sure error object defined before access its m…

…essage (#1569)
caolan · Aug 2, 2018 · 5c174fa · 5c174fa
1 parent 3741f80
commit 5c174fa
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/lib/asyncify.js b/lib/asyncify.js
@@ -87,7 +87,7 @@ function handlePromise(promise, callback) {
     return promise.then(value => {
         invokeCallback(callback, null, value);
     }, err => {
-        invokeCallback(callback, err.message ? err : new Error(err));
+        invokeCallback(callback, err && err.message ? err : new Error(err));
     });
 }
 

diff --git a/test/asyncify.js b/test/asyncify.js
@@ -91,6 +91,19 @@ describe('asyncify', () => {
                 });
             });
 
+            it('reject without reason', (done) => {
+                var promisified = function() {
+                    return new Promise(((resolve, reject) => {
+                        reject();
+                    }));
+                };
+                async.asyncify(promisified)("argument", (err) => {
+                    assert(err);
+                    expect(err.message).to.eql('');
+                    done();
+                });
+            });
+
             it('callback error @nodeonly', (done) => {
                 expectUncaughtException();