Title: [182025] branches/safari-600.5-branch/Source/WebCore
- Revision
- 182025
- Author
- [email protected]
- Date
- 2015-03-26 14:30:16 -0700 (Thu, 26 Mar 2015)
Log Message
Merged r182014. rdar://problem/20313011
Modified Paths
Diff
Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (182024 => 182025)
--- branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-03-26 21:02:29 UTC (rev 182024)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-03-26 21:30:16 UTC (rev 182025)
@@ -1,3 +1,19 @@
+2015-03-26 Babak Shafiei <[email protected]>
+
+ Merge r182014.
+
+ 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-16 Babak Shafiei <[email protected]>
Merge r181587.
Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm (182024 => 182025)
--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm 2015-03-26 21:02:29 UTC (rev 182024)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm 2015-03-26 21:30:16 UTC (rev 182025)
@@ -147,6 +147,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
