Apply patch. rdar://125984025

[iOS 17.5 beta] Crash in WebKit::ExtensionCapabilityGrant::operator= https://bugs.webkit.org/show_bug.cgi?id=272170 rdar://125984025 Reviewed by Sihui Liu. We need to invalidate the grant before deallocating it. * Source/WebKit/Platform/cocoa/ExtensionCapabilityGrant.h: * Source/WebKit/Platform/cocoa/ExtensionCapabilityGrant.mm: (WebKit::ExtensionCapabilityGrant::operator=): Canonical link: https://commits.webkit.org/277141@main Canonical link: https://commits.webkit.org/272448.885@safari-7618-branch
WebKit · Apr 8, 2024 · 9192181 · 9192181
1 parent 0def173
commit 9192181
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Source/WebKit/Platform/cocoa/ExtensionCapabilityGrant.h b/Source/WebKit/Platform/cocoa/ExtensionCapabilityGrant.h
@@ -41,7 +41,7 @@ class ExtensionCapabilityGrant {
     explicit ExtensionCapabilityGrant(String environmentIdentifier);
     ~ExtensionCapabilityGrant();
 
-    ExtensionCapabilityGrant& operator=(ExtensionCapabilityGrant&&) = default;
+    ExtensionCapabilityGrant& operator=(ExtensionCapabilityGrant&&);
     ExtensionCapabilityGrant isolatedCopy() &&;
 
     const String& environmentIdentifier() const { return m_environmentIdentifier; }

diff --git a/Source/WebKit/Platform/cocoa/ExtensionCapabilityGrant.mm b/Source/WebKit/Platform/cocoa/ExtensionCapabilityGrant.mm
@@ -62,6 +62,14 @@ static void platformInvalidate(BEProcessCapabilityGrant *platformGrant)
     setPlatformGrant(nil);
 }
 
+ExtensionCapabilityGrant& ExtensionCapabilityGrant::operator=(ExtensionCapabilityGrant&& grant)
+{
+    platformInvalidate(m_platformGrant.get());
+    m_environmentIdentifier = WTFMove(grant.m_environmentIdentifier);
+    m_platformGrant = WTFMove(grant.m_platformGrant);
+    return *this;
+}
+
 ExtensionCapabilityGrant ExtensionCapabilityGrant::isolatedCopy() &&
 {
     return {