Changeset 204232 in webkit

Timestamp:

Aug 6, 2016 6:41:40 PM (8 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] -[_WKRemoteObjectRegistry() _invokeMethod:] leaks a block
​https://bugs.webkit.org/show_bug.cgi?id=160636

Reviewed by Darin Adler.

• Shared/API/Cocoa/_WKRemoteObjectRegistry.mm:

(-[_WKRemoteObjectRegistry _invokeMethod:]): Release the block returned from

NSMakeSpecialForwardingCaptureBlock.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/API/Cocoa/_WKRemoteObjectRegistry.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-08-06  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] -[_WKRemoteObjectRegistry() _invokeMethod:] leaks a block
+        https://bugs.webkit.org/show_bug.cgi?id=160636
+
+        Reviewed by Darin Adler.
+
+        * Shared/API/Cocoa/_WKRemoteObjectRegistry.mm:
+        (-[_WKRemoteObjectRegistry _invokeMethod:]): Release the block returned from
+          __NSMakeSpecialForwardingCaptureBlock.
+
 2016-08-06  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectRegistry.mm

@@ -218 +218 @@
             uint64_t replyID = replyInfo->replyID;
             id replyBlock = __NSMakeSpecialForwardingCaptureBlock(wireBlockSignature._typeString.UTF8String, [interface, remoteObjectRegistry, replyID](NSInvocation *invocation) {
-
                 auto encoder = adoptNS([[WKRemoteObjectEncoder alloc] init]);
                 [encoder encodeObject:invocation forKey:invocationKey];
@@ -229 +228 @@
             // Make sure that the block won't be destroyed before the invocation.
             objc_setAssociatedObject(invocation, replyBlockKey, replyBlock, OBJC_ASSOCIATION_RETAIN);
+            [replyBlock release];
+
             break;
         }