Changeset 162091 in webkit

Timestamp:

Jan 15, 2014 2:35:19 PM (10 years ago)

Author:

ap@apple.com

Message:

Crash when multiple WebView instances have different PrivateBrowsing settings
​https://bugs.webkit.org/show_bug.cgi?id=127019

• WebView/WebPreferences.mm: (-[WebPreferences _updatePrivateBrowsingStateTo:]):

Added a null check to fix Safari crash on startup when extensions are enabled.

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebPreferences.mm (modified) (1 diff)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2014-01-15  Alexey Proskuryakov  <ap@apple.com>
+
+        Crash when multiple WebView instances have different PrivateBrowsing settings
+        https://bugs.webkit.org/show_bug.cgi?id=127019
+
+        * WebView/WebPreferences.mm: (-[WebPreferences _updatePrivateBrowsingStateTo:]):
+        Added a null check to fix Safari crash on startup when extensions are enabled.
+
 2014-01-15  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebPreferences.mm

@@ -1098 +1098 @@
 - (void)_updatePrivateBrowsingStateTo:(BOOL)enabled
 {
+    if (!_private) {
+        ASSERT(!enabled);
+        return;
+    }
+
     if (enabled == _private->inPrivateBrowsing)
         return;