blob: 1a6b685450c5073b20b4bd49db12b93788d8a2c5 [file] [log] [blame]
Patrick Williams91c40602023-06-15 05:43:17 -05001CVE: CVE-2022-32888
2Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/a3dd7dc]
3
4[1]: https://support.apple.com/en-us/HT213446
5[2]: https://bugs.webkit.org/show_bug.cgi?id=242047
6
7Signed-off-by: Kai Kang <kai.kang@windriver.com>
8
9From a3dd7dc5f60b87a7cfd14c372e40ebd339076763 Mon Sep 17 00:00:00 2001
10From: Yusuke Suzuki <ysuzuki@apple.com>
11Date: Mon, 27 Jun 2022 21:34:55 -0700
12Subject: [PATCH] [JSC] Drop wasm stale assertion
13 https://bugs.webkit.org/show_bug.cgi?id=242047 rdar://95866655
14
15Reviewed by Mark Lam.
16
17This patch drops stale assertion in addDelegateToUnreachable.
18
19* Source/JavaScriptCore/wasm/WasmLLIntGenerator.cpp:
20(JSC::Wasm::LLIntGenerator::addDelegateToUnreachable):
21
22Canonical link: https://commits.webkit.org/251902@main
23---
24 Source/JavaScriptCore/wasm/WasmLLIntGenerator.cpp | 1 -
25 1 file changed, 1 deletion(-)
26
27diff --git a/Source/JavaScriptCore/wasm/WasmLLIntGenerator.cpp b/Source/JavaScriptCore/wasm/WasmLLIntGenerator.cpp
28index 39fb39b3331f..d0d2b9725991 100644
29--- a/Source/JavaScriptCore/wasm/WasmLLIntGenerator.cpp
30+++ b/Source/JavaScriptCore/wasm/WasmLLIntGenerator.cpp
31@@ -1182,7 +1182,6 @@ auto LLIntGenerator::addDelegateToUnreachable(ControlType& target, ControlType&
32
33 ControlTry& tryData = std::get<ControlTry>(data);
34 m_codeBlock->addExceptionHandler({ HandlerType::Delegate, tryData.m_try->location(), delegateLabel->location(), 0, m_tryDepth, targetDepth });
35- checkConsistency();
36 return { };
37 }
38
39--
402.34.1
41