Changeset 218760 in webkit

Timestamp:

Jun 23, 2017 1:45:46 PM (7 years ago)

Author:

ddkilzer@apple.com

Message:

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

Reviewed by Tim Horton.

• UIProcess/API/Cocoa/WKProcessPool.mm:

(policiesHashMapToDictionary): Use adoptNS().get() to avoid
dumping objects into autoreleasepools unnecessarily.

• UIProcess/API/Cocoa/WKProcessPoolPrivate.h:

(-[WKProcessPool _pluginLoadClientPolicies]): Add back 'copy'
attribute to document that we're returning a new object on each
invocation. I shouldn't have removed it in the v2 patch.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKProcessPool.mm (modified) (2 diffs)
• UIProcess/API/Cocoa/WKProcessPoolPrivate.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-06-23  David Kilzer  <ddkilzer@apple.com>
+
+        v3: REGRESSION (r218419): 3 NSMutableDictionary leaks calling -[WKProcessPool _pluginLoadClientPolicies]
+        <https://webkit.org/b/173689>
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/Cocoa/WKProcessPool.mm:
+        (policiesHashMapToDictionary): Use adoptNS().get() to avoid
+        dumping objects into autoreleasepools unnecessarily.
+        * UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
+        (-[WKProcessPool _pluginLoadClientPolicies]): Add back 'copy'
+        attribute to document that we're returning a new object on each
+        invocation.  I shouldn't have removed it in the v2 patch.
+
 2017-06-23  Youenn Fablet  <youenn@apple.com>
 

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2014, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2017 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -314 +314 @@
 static NSDictionary *policiesHashMapToDictionary(const HashMap<String, HashMap<String, HashMap<String, uint8_t>>>& map)
 {
-    NSMutableDictionary *policies = [NSMutableDictionary dictionaryWithCapacity:map.size()];
+    auto policies = adoptNS([[NSMutableDictionary alloc] initWithCapacity:map.size()]);
     for (auto& hostPair : map) {
         NSString *host = hostPair.key;
-        policies[host] = [NSMutableDictionary dictionaryWithCapacity:hostPair.value.size()];
+        policies.get()[host] = adoptNS([[NSMutableDictionary alloc] initWithCapacity:hostPair.value.size()]).get();
         for (auto& bundleIdentifierPair : hostPair.value) {
             NSString *bundlerIdentifier = bundleIdentifierPair.key;
-            policies[host][bundlerIdentifier] = [NSMutableDictionary dictionaryWithCapacity:bundleIdentifierPair.value.size()];
+            policies.get()[host][bundlerIdentifier] = adoptNS([[NSMutableDictionary alloc] initWithCapacity:bundleIdentifierPair.value.size()]).get();
             for (auto& versionPair : bundleIdentifierPair.value) {
                 NSString *version = versionPair.key;
-                policies[host][bundlerIdentifier][version] = [NSNumber numberWithUnsignedInt:versionPair.value];
+                policies.get()[host][bundlerIdentifier][version] = adoptNS([[NSNumber alloc] initWithUnsignedInt:versionPair.value]).get();
             }
         }
     }
-    return policies;
+    return policies.autorelease();
 }
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2017 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -55 +55 @@
 #if !TARGET_OS_IPHONE
 - (void)_resetPluginLoadClientPolicies:(NSDictionary *)policies WK_API_AVAILABLE(macosx(WK_MAC_TBA));
-@property (nonatomic, readonly) NSDictionary *_pluginLoadClientPolicies WK_API_AVAILABLE(macosx(WK_MAC_TBA));
+@property (nonatomic, readonly, copy) NSDictionary *_pluginLoadClientPolicies WK_API_AVAILABLE(macosx(WK_MAC_TBA));
 #endif