Commit bee4451
deps: V8: cherry-pick cc9a8a37445e
Original commit message:
fix overflow check in error formatting
Bug: v8:12494
Change-Id: Iba2684173296aa236f1a1c73a5606c21472eff06
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3426634
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Commit-Queue: Gus Caplan <snek@chromium.org>
Cr-Commit-Position: refs/heads/main@{#78909}
Refs: v8/v8@cc9a8a3
PR-URL: #41823
Reviewed-By: Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Mary Marchini <oss@mmarchini.me>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>1 parent 49f6b97 commit bee4451
1 file changed
Lines changed: 3 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -306,7 +306,8 @@ MaybeHandle<Object> ErrorUtils::FormatStackTrace(Isolate* isolate, | |||
| 306 | 306 | const bool in_recursion = isolate->formatting_stack_trace(); | |
| 307 | 307 | const bool has_overflowed = i::StackLimitCheck{isolate}.HasOverflowed(); | |
| 308 | 308 | Handle<Context> error_context; | |
| 309 | - if (!in_recursion && error->GetCreationContext().ToHandle(&error_context)) { | ||
| 309 | + if (!in_recursion && !has_overflowed && | ||
| 310 | + error->GetCreationContext().ToHandle(&error_context)) { | ||
| 310 | 311 | DCHECK(error_context->IsNativeContext()); | |
| 311 | 312 | ||
| 312 | 313 | if (isolate->HasPrepareStackTraceCallback()) { | |
@@ -322,7 +323,7 @@ MaybeHandle<Object> ErrorUtils::FormatStackTrace(Isolate* isolate, | |||
| 322 | 323 | isolate->RunPrepareStackTraceCallback(error_context, error, sites), | |
| 323 | 324 | Object); | |
| 324 | 325 | return result; | |
| 325 | - } else if (!has_overflowed) { | ||
| 326 | + } else { | ||
| 326 | 327 | Handle<JSFunction> global_error = | |
| 327 | 328 | handle(error_context->error_function(), isolate); | |
| 328 | 329 | ||
0 commit comments