Changeset 167573 in webkit

Timestamp:

Apr 20, 2014, 1:54:17 PM (11 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] Crash when setting a bundle parameter to nil
​https://bugs.webkit.org/show_bug.cgi?id=131917

Reviewed by Sam Weinig.

• UIProcess/API/Cocoa/WKProcessPool.mm:

(-[WKProcessPool _setObject:forBundleParameter:]): If the object is nil, use
-[NSMutableDictionary removeObjectForKey:] rather than -setObject:forKey:.

• WebProcess/InjectedBundle/API/Cocoa/WKWebProcessBundleParameters.mm:

(-[WKWebProcessBundleParameters setParameter:forKey:]): Ditto.

• WebProcess/InjectedBundle/mac/InjectedBundleMac.mm:

(WebKit::InjectedBundle::setBundleParameter): Unrelatedly, create m_bundleParameters if
needed, as it may have not been created on intialization if no bundle parameters were set
at the time.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKProcessPool.mm (modified) (1 diff)
• WebProcess/InjectedBundle/API/Cocoa/WKWebProcessBundleParameters.mm (modified) (1 diff)
• WebProcess/InjectedBundle/mac/InjectedBundleMac.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-20  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] Crash when setting a bundle parameter to nil
+        https://bugs.webkit.org/show_bug.cgi?id=131917
+
+        Reviewed by Sam Weinig.
+
+        * UIProcess/API/Cocoa/WKProcessPool.mm:
+        (-[WKProcessPool _setObject:forBundleParameter:]): If the object is nil, use
+        -[NSMutableDictionary removeObjectForKey:] rather than -setObject:forKey:.
+
+        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessBundleParameters.mm:
+        (-[WKWebProcessBundleParameters setParameter:forKey:]): Ditto.
+
+        * WebProcess/InjectedBundle/mac/InjectedBundleMac.mm:
+        (WebKit::InjectedBundle::setBundleParameter): Unrelatedly, create m_bundleParameters if
+        needed, as it may have not been created on intialization if no bundle parameters were set
+        at the time.
+
 2014-04-20  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm

@@ -183 +183 @@
     }
 
-    [_context->ensureBundleParameters() setObject:copy.get() forKey:parameter];
+    if (copy)
+        [_context->ensureBundleParameters() setObject:copy.get() forKey:parameter];
+    else
+        [_context->ensureBundleParameters() removeObjectForKey:parameter];
+
     _context->sendToAllProcesses(Messages::WebProcess::SetInjectedBundleParameter(parameter, IPC::DataReference(static_cast<const uint8_t*>([data bytes]), [data length])));
 }

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessBundleParameters.mm

@@ -53 +53 @@
 {
     [self willChangeValueForKey:key];
-    [_parameters setValue:parameter forKey:key];
+    if (parameter)
+        [_parameters setValue:parameter forKey:key];
+    else
+        [_parameters removeObjectForKey:key];
     [self didChangeValueForKey:key];
 }

trunk/Source/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm

@@ -153 +153 @@
     }
 
+    if (!m_bundleParameters && parameter)
+        m_bundleParameters = adoptNS([[WKWebProcessBundleParameters alloc] initWithDictionary:[NSDictionary dictionary]]);
+
     [m_bundleParameters setParameter:parameter forKey:key];
 #endif