Fixes #1006

petkaantonov · Feb 13, 2016 · ffcad46 · ffcad46
1 parent e9f8502
commit ffcad46
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/src/finally.js b/src/finally.js
@@ -12,6 +12,10 @@ function PassThroughHandlerContext(promise, type, handler) {
     this.cancelPromise = null;
 }
 
+PassThroughHandlerContext.prototype.isFinallyHandler = function() {
+    return this.type === FINALLY_TYPE;
+};
+
 function FinallyHandlerCancelReaction(finallyHandler) {
     this.finallyHandler = finallyHandler;
 }
@@ -47,7 +51,7 @@ function finallyHandler(reasonOrValue) {
 
     if (!this.called) {
         this.called = true;
-        var ret = this.type === FINALLY_TYPE
+        var ret = this.isFinallyHandler()
             ? handler.call(promise._boundValue())
             : handler.call(promise._boundValue(), reasonOrValue);
         if (ret !== undefined) {

diff --git a/src/promise.js b/src/promise.js
@@ -570,7 +570,8 @@ Promise.prototype._settlePromise = function(promise, handler, receiver, value) {
     if (BIT_FIELD_CHECK(IS_CANCELLED)) {
         if (isPromise) promise._invokeInternalOnCancel();
 
-        if (receiver instanceof PassThroughHandlerContext) {
+        if (receiver instanceof PassThroughHandlerContext &&
+            receiver.isFinallyHandler()) {
             receiver.cancelPromise = promise;
             if (tryCatch(handler).call(receiver, value) === errorObj) {
                 promise._reject(errorObj.e);

diff --git a/test/mocha/regress.js b/test/mocha/regress.js
@@ -80,6 +80,12 @@ describe("regressions", function() {
         });
     });
 
+    specify("gh-1006", function() {
+        return Promise.resolve().then(function() {
+            new Promise(function() {}).tap(function() {}).cancel();
+        });
+    });
+
     if (testUtils.isNodeJS) {
         describe("github-689", function() {
             var originalProperty = Object.getOwnPropertyDescriptor(process, "domain");