Changeset 201521 in webkit

Timestamp:

May 31, 2016, 1:32:21 PM (10 years ago)

Author:

Chris Dumez

Message:

Regression(r201482): Crash under dispatch_semaphore_wait
​https://bugs.webkit.org/show_bug.cgi?id=158230
<rdar://problem/26534698>

Reviewed by Eric Carlson.

Stop moving hasSessionSemaphore in the lambda capture since it is used in
dispatch_semaphore_wait() call after the callOnMainThread() call.

No new tests, already covered by tests that are crashing on the bots.

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

(-[WebAVStreamDataParserListener streamDataParser:didProvideContentKeyRequestInitializationData:forTrackID:]):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-05-31  Chris Dumez  <cdumez@apple.com>
+
+        Regression(r201482): Crash under dispatch_semaphore_wait
+        https://bugs.webkit.org/show_bug.cgi?id=158230
+        <rdar://problem/26534698>
+
+        Reviewed by Eric Carlson.
+
+        Stop moving hasSessionSemaphore in the lambda capture since it is used in
+        dispatch_semaphore_wait() call after the callOnMainThread() call.
+
+        No new tests, already covered by tests that are crashing on the bots.
+
+        * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
+        (-[WebAVStreamDataParserListener streamDataParser:didProvideContentKeyRequestInitializationData:forTrackID:]):
+
 2016-05-31  Brady Eidson  <beidson@apple.com>
 

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

@@ -276 +276 @@
 
     OSObjectPtr<dispatch_semaphore_t> hasSessionSemaphore = adoptOSObject(dispatch_semaphore_create(0));
-    callOnMainThread([protectedSelf = WTFMove(protectedSelf), protectedInitData = RetainPtr<NSData>(initData), trackID, hasSessionSemaphore = WTFMove(hasSessionSemaphore)] {
+    callOnMainThread([protectedSelf = WTFMove(protectedSelf), protectedInitData = RetainPtr<NSData>(initData), trackID, hasSessionSemaphore] {
         if (protectedSelf->_parent)
             protectedSelf->_parent->didProvideContentKeyRequestInitializationDataForTrackID(protectedInitData.get(), trackID, hasSessionSemaphore);