[promise] Harden PromiseHasUserDefinedRejectHandlerInternal

camillobruni · V8 LUCI CQ · commit a77c91f6a7f4 · 2022-10-04T15:45:41.000Z
Add stricter checks for when the debugger is active. Bug: chromium:1370423, chromium:1364149 Change-Id: I336d9887fca0c5bd85b0bd8a6fa7db5d1aac0071 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3932177 Reviewed-by: Toon Verwaest <verwaest@chromium.org> Reviewed-by: Leszek Swirski <leszeks@chromium.org> Commit-Queue: Camillo Bruni <cbruni@chromium.org> Cr-Commit-Position: refs/heads/main@{#83519}
diff --git a/src/execution/isolate.cc b/src/execution/isolate.cc
@@ -2807,13 +2807,15 @@ bool PromiseHasUserDefinedRejectHandlerInternal(Isolate* isolate,
             Handle<PromiseCapability>::cast(promise_or_capability)->promise(),
             isolate);
       }
-      promise = Handle<JSPromise>::cast(promise_or_capability);
-      if (!reaction->reject_handler().IsUndefined(isolate)) {
-        Handle<JSReceiver> reject_handler(
-            JSReceiver::cast(reaction->reject_handler()), isolate);
-        if (PromiseIsRejectHandler(isolate, reject_handler)) return true;
+      if (promise_or_capability->IsJSPromise()) {
+        promise = Handle<JSPromise>::cast(promise_or_capability);
+        if (!reaction->reject_handler().IsUndefined(isolate)) {
+          Handle<JSReceiver> reject_handler(
+              JSReceiver::cast(reaction->reject_handler()), isolate);
+          if (PromiseIsRejectHandler(isolate, reject_handler)) return true;
+        }
+        if (isolate->PromiseHasUserDefinedRejectHandler(promise)) return true;
       }
-      if (isolate->PromiseHasUserDefinedRejectHandler(promise)) return true;
     }
     current = handle(reaction->next(), isolate);
   }

Original file line number	Diff line number	Diff line change
`@@ -2807,13 +2807,15 @@ bool PromiseHasUserDefinedRejectHandlerInternal(Isolate* isolate,`
`2807`	`2807`	`Handle<PromiseCapability>::cast(promise_or_capability)->promise(),`
`2808`	`2808`	`isolate);`
`2809`	`2809`	`}`
`2810`		`- promise = Handle<JSPromise>::cast(promise_or_capability);`
`2811`		`- if (!reaction->reject_handler().IsUndefined(isolate)) {`
`2812`		`- Handle<JSReceiver> reject_handler(`
`2813`		`- JSReceiver::cast(reaction->reject_handler()), isolate);`
`2814`		`- if (PromiseIsRejectHandler(isolate, reject_handler)) return true;`
	`2810`	`+ if (promise_or_capability->IsJSPromise()) {`
	`2811`	`+ promise = Handle<JSPromise>::cast(promise_or_capability);`
	`2812`	`+ if (!reaction->reject_handler().IsUndefined(isolate)) {`
	`2813`	`+ Handle<JSReceiver> reject_handler(`
	`2814`	`+ JSReceiver::cast(reaction->reject_handler()), isolate);`
	`2815`	`+ if (PromiseIsRejectHandler(isolate, reject_handler)) return true;`
	`2816`	`+ }`
	`2817`	`+ if (isolate->PromiseHasUserDefinedRejectHandler(promise)) return true;`
`2815`	`2818`	`}`
`2816`		`- if (isolate->PromiseHasUserDefinedRejectHandler(promise)) return true;`
`2817`	`2819`	`}`
`2818`	`2820`	`current = handle(reaction->next(), isolate);`
`2819`	`2821`	`}`