Changeset 143540 in webkit

Timestamp:

Feb 20, 2013, 5:09:37 PM (12 years ago)

Author:

jer.noble@apple.com

Message:

Crash in com.apple.WebKit2.WebProcessService at com.apple.avfoundation: 73-[AVAssetResourceLoader _attemptDelegateHandlingOfRequestWithDictionary:]_block_invoke + 51
​https://bugs.webkit.org/show_bug.cgi?id=110385

Reviewed by Eric Carlson.

Ensure AVFoundation does not attempt to message a dead object by explicitly disassociating
the AVAssetResourceLoaderDelegate on MediaPlayerPrivateAVFoundationObjC destruction.

• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:

(WebCore::MediaPlayerPrivateAVFoundationObjC::~MediaPlayerPrivateAVFoundationObjC):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-20  Jer Noble  <jer.noble@apple.com>
+
+        Crash in com.apple.WebKit2.WebProcessService at com.apple.avfoundation: __73-[AVAssetResourceLoader _attemptDelegateHandlingOfRequestWithDictionary:]_block_invoke + 51
+        https://bugs.webkit.org/show_bug.cgi?id=110385
+
+        Reviewed by Eric Carlson.
+
+        Ensure AVFoundation does not attempt to message a dead object by explicitly disassociating
+        the AVAssetResourceLoaderDelegate on MediaPlayerPrivateAVFoundationObjC destruction.
+
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::~MediaPlayerPrivateAVFoundationObjC):
+
 2013-02-20  Ojan Vafai  <ojan@chromium.org>
 

trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

@@ -234 +234 @@
     playerToPrivateMap().remove(player());
 #endif
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+    [[m_avAsset.get() resourceLoader] setDelegate:nil queue:0];
+#endif
     cancelLoad();
 }