Cherry-pick d6540a3. rdar://126492909

Regression(277427@main) Crash under AuxiliaryProcessProxy::notifyPreferencesChanged() https://bugs.webkit.org/show_bug.cgi?id=272695 rdar://126492909 Reviewed by Per Arne Vollan. We were using a HashMap to store preferences whose key was a std::pair<String, String>. The first String was the domain and the second the preference name. However, for global preferences, the domain is null, causing a crash when hashing the key. To address an issue, we now store global preferences in a separate HashMap. * Source/WebKit/Shared/AuxiliaryProcess.h: * Source/WebKit/Shared/AuxiliaryProcess.messages.in: * Source/WebKit/Shared/Cocoa/AuxiliaryProcessCocoa.mm: (WebKit::AuxiliaryProcess::preferencesDidUpdate): * Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp: (WebKit::AuxiliaryProcessProxy::didChangeThrottleState): * Source/WebKit/UIProcess/AuxiliaryProcessProxy.h: * Source/WebKit/UIProcess/Cocoa/AuxiliaryProcessProxyCocoa.mm: (WebKit::AuxiliaryProcessProxy::notifyPreferencesChanged): Canonical link: https://commits.webkit.org/277514@main
WebKit · Apr 16, 2024 · 168c94d · 168c94d
1 parent 6ae7097
commit 168c94d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/Source/WebKit/Shared/AuxiliaryProcess.h b/Source/WebKit/Shared/AuxiliaryProcess.h
@@ -110,7 +110,7 @@ class AuxiliaryProcess : public IPC::Connection::Client, public IPC::MessageSend
 
 #if ENABLE(CFPREFS_DIRECT_MODE)
     virtual void preferenceDidUpdate(const String& domain, const String& key, const std::optional<String>& encodedValue);
-    void preferencesDidUpdate(HashMap<std::pair<String, String>, std::optional<String>>);
+    void preferencesDidUpdate(HashMap<String, std::optional<String>> domainlessPreferences, HashMap<std::pair<String, String>, std::optional<String>> preferences);
 #endif
 
 protected:

diff --git a/Source/WebKit/Shared/AuxiliaryProcess.messages.in b/Source/WebKit/Shared/AuxiliaryProcess.messages.in
@@ -28,7 +28,7 @@ messages -> AuxiliaryProcess NotRefCounted {
 
 #if ENABLE(CFPREFS_DIRECT_MODE)
     PreferenceDidUpdate(String domain, String key, std::optional<String> encodedValue)
-    PreferencesDidUpdate(HashMap<std::pair<String, String>, std::optional<String>> preferences)
+    PreferencesDidUpdate(HashMap<String, std::optional<String>> domainlessPreferences, HashMap<std::pair<String, String>, std::optional<String>> preferences)
 #endif
 
 #if OS(LINUX)

diff --git a/Source/WebKit/Shared/Cocoa/AuxiliaryProcessCocoa.mm b/Source/WebKit/Shared/Cocoa/AuxiliaryProcessCocoa.mm
@@ -207,8 +207,10 @@ static void initializeTimerCoalescingPolicy()
 }
 
 #if ENABLE(CFPREFS_DIRECT_MODE)
-void AuxiliaryProcess::preferencesDidUpdate(HashMap<std::pair<String, String>, std::optional<String>> preferences)
+void AuxiliaryProcess::preferencesDidUpdate(HashMap<String, std::optional<String>> domainlessPreferences, HashMap<std::pair<String, String>, std::optional<String>> preferences)
 {
+    for (auto& [key, value] : domainlessPreferences)
+        preferenceDidUpdate(String(), key, value);
     for (auto& [key, value] : preferences)
         preferenceDidUpdate(key.first, key.second, value);
 }

diff --git a/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp b/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp
@@ -554,8 +554,8 @@ void AuxiliaryProcessProxy::didChangeThrottleState(ProcessThrottleState state)
         return;
     m_isSuspended = isNowSuspended;
 #if ENABLE(CFPREFS_DIRECT_MODE)
-    if (!m_isSuspended && !m_preferencesUpdatedWhileSuspended.isEmpty())
-        send(Messages::AuxiliaryProcess::PreferencesDidUpdate(std::exchange(m_preferencesUpdatedWhileSuspended, { })), 0);
+    if (!m_isSuspended && (!m_domainlessPreferencesUpdatedWhileSuspended.isEmpty() || !m_preferencesUpdatedWhileSuspended.isEmpty()))
+        send(Messages::AuxiliaryProcess::PreferencesDidUpdate(std::exchange(m_domainlessPreferencesUpdatedWhileSuspended, { }), std::exchange(m_preferencesUpdatedWhileSuspended, { })), 0);
 #endif
 }
 

diff --git a/Source/WebKit/UIProcess/AuxiliaryProcessProxy.h b/Source/WebKit/UIProcess/AuxiliaryProcessProxy.h
@@ -280,6 +280,7 @@ class AuxiliaryProcessProxy
     ExtensionCapabilityGrantMap m_extensionCapabilityGrants;
 #endif
 #if ENABLE(CFPREFS_DIRECT_MODE)
+    HashMap<String, std::optional<String>> m_domainlessPreferencesUpdatedWhileSuspended;
     HashMap<std::pair<String /* domain */, String /* key */>, std::optional<String>> m_preferencesUpdatedWhileSuspended;
 #endif
 };

diff --git a/Source/WebKit/UIProcess/Cocoa/AuxiliaryProcessProxyCocoa.mm b/Source/WebKit/UIProcess/Cocoa/AuxiliaryProcessProxyCocoa.mm
@@ -145,9 +145,12 @@
 #if ENABLE(CFPREFS_DIRECT_MODE)
 void AuxiliaryProcessProxy::notifyPreferencesChanged(const String& domain, const String& key, const std::optional<String>& encodedValue)
 {
-    if (m_isSuspended)
-        m_preferencesUpdatedWhileSuspended.set(std::pair { domain, key }, encodedValue);
-    else
+    if (m_isSuspended) {
+        if (domain.isNull())
+            m_domainlessPreferencesUpdatedWhileSuspended.set(key, encodedValue);
+        else
+            m_preferencesUpdatedWhileSuspended.set(std::pair { domain , key }, encodedValue);
+    } else
         send(Messages::AuxiliaryProcess::PreferenceDidUpdate(domain, key, encodedValue), 0);
 }
 #endif