From 1193290f3f3ae6a0845b47ba082dc85eb48d6d44 Mon Sep 17 00:00:00 2001 From: devsnek Date: Wed, 30 Mar 2022 07:01:01 -0500 Subject: [PATCH] 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 Commit-Queue: Gus Caplan Cr-Commit-Position: refs/heads/main@{#78909} Refs: https://github.com/v8/v8/commit/cc9a8a37445eeffff17474020bb6038c2f9af9fc PR-URL: https://github.com/nodejs/node/pull/42065 Reviewed-By: Rich Trott Reviewed-By: Jiawen Geng Reviewed-By: Antoine du Hamel Reviewed-By: Mestery Reviewed-By: Darshan Sen --- common.gypi | 2 +- deps/v8/src/execution/messages.cc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common.gypi b/common.gypi index 34bf547d5e9147..2bfae462d0e7fe 100644 --- a/common.gypi +++ b/common.gypi @@ -34,7 +34,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.56', + 'v8_embedder_string': '-node.57', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/execution/messages.cc b/deps/v8/src/execution/messages.cc index 63d1e2be1ff7af..b3e9d1a6b55fa6 100644 --- a/deps/v8/src/execution/messages.cc +++ b/deps/v8/src/execution/messages.cc @@ -823,7 +823,8 @@ MaybeHandle ErrorUtils::FormatStackTrace(Isolate* isolate, Handle elems = Handle::cast(raw_stack); const bool in_recursion = isolate->formatting_stack_trace(); - if (!in_recursion) { + const bool has_overflowed = i::StackLimitCheck{isolate}.HasOverflowed(); + if (!in_recursion && !has_overflowed) { Handle error_context = error->GetCreationContext(); DCHECK(error_context->IsNativeContext());