Changeset 195900 in webkit

Timestamp:

Jan 30, 2016 11:22:58 AM (8 years ago)

Author:

ddkilzer@apple.com

Message:

[iOS] WebKit1 apps crash in _ZN7WebCore16DiskCacheMonitorC2ERKNS_15ResourceRequestENS_9SessionIDEPK20_CFCachedURLResponse_block_invoke1
<​http://webkit.org/b/153710>
<rdar://problem/23116706>

Reviewed by Darin Adler.

• loader/cocoa/DiskCacheMonitorCocoa.mm:

(WebCore::DiskCacheMonitor::DiskCacheMonitor):

• Fix race condition on iOS WebKit1 clients by calling the block to cancel the DiskCacheMonitor on the WebThread, which is the same thread where the CFCachedURLResponseCallBackBlock is called.
• Removed whitespace to adhere to style.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/cocoa/DiskCacheMonitorCocoa.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-30  David Kilzer  <ddkilzer@apple.com>
+
+        [iOS] WebKit1 apps crash in ___ZN7WebCore16DiskCacheMonitorC2ERKNS_15ResourceRequestENS_9SessionIDEPK20_CFCachedURLResponse_block_invoke1
+        <http://webkit.org/b/153710>
+        <rdar://problem/23116706>
+
+        Reviewed by Darin Adler.
+
+        * loader/cocoa/DiskCacheMonitorCocoa.mm:
+        (WebCore::DiskCacheMonitor::DiskCacheMonitor):
+        - Fix race condition on iOS WebKit1 clients by calling the block
+          to cancel the DiskCacheMonitor on the WebThread, which is the
+          same thread where the CFCachedURLResponseCallBackBlock is
+          called.
+        - Removed whitespace to adhere to style.
+
 2016-01-30  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm

@@ -72 +72 @@
     // Set up a delayed callback to cancel this monitor if the resource hasn't been cached yet.
     __block DiskCacheMonitor* rawMonitor = this;
-
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, NSEC_PER_SEC * diskCacheMonitorTimeout), dispatch_get_main_queue(), ^{
+    auto cancelMonitorBlock = ^{
         delete rawMonitor; // Balanced by "new DiskCacheMonitor" in monitorFileBackingStoreCreation.
         rawMonitor = nullptr;
-    });
+    };
+
+#if USE(WEB_THREAD)
+    auto cancelMonitorBlockToRun = ^{
+        WebThreadRun(cancelMonitorBlock);
+    };
+#else
+    auto cancelMonitorBlockToRun = cancelMonitorBlock;
+#endif
+
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, NSEC_PER_SEC * diskCacheMonitorTimeout), dispatch_get_main_queue(), cancelMonitorBlockToRun);
 
     // Set up the disk caching callback to create the ShareableResource and send it to the WebProcess.
@@ -97 +106 @@
 
 #if USE(WEB_THREAD)
-    CFCachedURLResponseCallBackBlock blockToRun = ^ (CFCachedURLResponseRef response)
+    CFCachedURLResponseCallBackBlock blockToRun = ^(CFCachedURLResponseRef response)
     {
         CFRetain(response);
-        WebThreadRun(^ {
+        WebThreadRun(^{
             block(response);
             CFRelease(response);