Title: [182014] trunk/Source/WebCore
Revision
182014
Author
[email protected]
Date
2015-03-26 10:24:21 -0700 (Thu, 26 Mar 2015)

Log Message

[Mac][EME] Crash at com.apple.WebCore: WebCore::CDMSessionMediaSourceAVFObjC::releaseKeys + 177
https://bugs.webkit.org/show_bug.cgi?id=143080

Reviewed by Eric Carlson.

Null-check m_certificate before dereferencing.

* platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm:
(WebCore::CDMSessionMediaSourceAVFObjC::releaseKeys):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (182013 => 182014)


--- trunk/Source/WebCore/ChangeLog	2015-03-26 17:04:38 UTC (rev 182013)
+++ trunk/Source/WebCore/ChangeLog	2015-03-26 17:24:21 UTC (rev 182014)
@@ -1,3 +1,15 @@
+2015-03-26  Jer Noble  <[email protected]>
+
+        [Mac][EME] Crash at com.apple.WebCore: WebCore::CDMSessionMediaSourceAVFObjC::releaseKeys + 177
+        https://bugs.webkit.org/show_bug.cgi?id=143080
+
+        Reviewed by Eric Carlson.
+
+        Null-check m_certificate before dereferencing.
+
+        * platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm:
+        (WebCore::CDMSessionMediaSourceAVFObjC::releaseKeys):
+
 2015-03-26  Chris Fleizach  <[email protected]>
 
         AX: [role="button"][aria-pressed] should be exposed as AXCheckbox:AXToggleButton, with role description of "toggle button"

Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm (182013 => 182014)


--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm	2015-03-26 17:04:38 UTC (rev 182013)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm	2015-03-26 17:24:21 UTC (rev 182014)
@@ -148,6 +148,9 @@
         LOG(Media, "CDMSessionMediaSourceAVFObjC::releaseKeys(%p) - expiring stream session", this);
         [m_streamSession expire];
 
+        if (!m_certificate)
+            return;
+
         if (![getAVStreamSessionClass() respondsToSelector:@selector(pendingExpiredSessionReportsWithAppIdentifier:storageDirectoryAtURL:)])
             return;
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to