Changeset 218678 in webkit

Timestamp:

Jun 21, 2017, 9:46:42 PM (8 years ago)

Author:

ddkilzer@apple.com

Message:

REGRESSION (r218419): 3 NSMutableDiciontary leaks calling -[WKProcessPool _pluginLoadClientPolicies]
<​https://webkit.org/b/173689>

Reviewed by Chris Dumez.

Caught by the clang static analyzer.

• UIProcess/API/Cocoa/WKProcessPool.mm:

(policiesHashMapToDictionary): Switch from using
[[NSMutableDictionary alloc] init] which returns a +1 retained
object in MRR to [NSMutableDictionary new] which returns an
autoreleased object under MRR. This bug caused 3 leaks when
calling -[WKProcessPool _pluginLoadClientPolicies], which should
return an autoreleased object based on its signature.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKProcessPool.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-06-21  David Kilzer  <ddkilzer@apple.com>
+
+        REGRESSION (r218419): 3 NSMutableDiciontary leaks calling -[WKProcessPool _pluginLoadClientPolicies]
+        <https://webkit.org/b/173689>
+
+        Reviewed by Chris Dumez.
+
+        Caught by the clang static analyzer.
+
+        * UIProcess/API/Cocoa/WKProcessPool.mm:
+        (policiesHashMapToDictionary): Switch from using
+        [[NSMutableDictionary alloc] init] which returns a +1 retained
+        object in MRR to [NSMutableDictionary new] which returns an
+        autoreleased object under MRR.  This bug caused 3 leaks when
+        calling -[WKProcessPool _pluginLoadClientPolicies], which should
+        return an autoreleased object based on its signature.
+
 2017-06-21  Ryosuke Niwa  <rniwa@webkit.org>
 

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

@@ -314 +314 @@
 static NSDictionary *policiesHashMapToDictionary(const HashMap<String, HashMap<String, HashMap<String, uint8_t>>>& map)
 {
-    NSMutableDictionary *policies = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *policies = [NSMutableDictionary new];
     for (auto& hostPair : map) {
         NSString *host = hostPair.key;
-        policies[host] = [[NSMutableDictionary alloc] init];
+        policies[host] = [NSMutableDictionary new];
         for (auto& bundleIdentifierPair : hostPair.value) {
             NSString *bundlerIdentifier = bundleIdentifierPair.key;
-            policies[host][bundlerIdentifier] = [[NSMutableDictionary alloc] init];
+            policies[host][bundlerIdentifier] = [NSMutableDictionary new];
             for (auto& versionPair : bundleIdentifierPair.value) {
                 NSString *version = versionPair.key;