Title: [241507] branches/safari-607-branch/Source/WebCore
- Revision
- 241507
- Author
- bshaf...@apple.com
- Date
- 2019-02-14 00:34:34 -0800 (Thu, 14 Feb 2019)
Log Message
Cherry-pick r241479. rdar://problem/48065642
Null-deref crash at SourceBufferPrivateAVFObjC::outputObscuredDueToInsufficientExternalProtectionChanged()
https://bugs.webkit.org/show_bug.cgi?id=194613
<rdar://problem/48023912>
Reviewed by Eric Carlson.
* platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
(WebCore::SourceBufferPrivateAVFObjC::outputObscuredDueToInsufficientExternalProtectionChanged):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@241479 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-607-branch/Source/WebCore/ChangeLog (241506 => 241507)
--- branches/safari-607-branch/Source/WebCore/ChangeLog 2019-02-14 08:34:31 UTC (rev 241506)
+++ branches/safari-607-branch/Source/WebCore/ChangeLog 2019-02-14 08:34:34 UTC (rev 241507)
@@ -1,5 +1,32 @@
2019-02-13 Babak Shafiei <bshaf...@apple.com>
+ Cherry-pick r241479. rdar://problem/48065642
+
+ Null-deref crash at SourceBufferPrivateAVFObjC::outputObscuredDueToInsufficientExternalProtectionChanged()
+ https://bugs.webkit.org/show_bug.cgi?id=194613
+ <rdar://problem/48023912>
+
+ Reviewed by Eric Carlson.
+
+ * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
+ (WebCore::SourceBufferPrivateAVFObjC::outputObscuredDueToInsufficientExternalProtectionChanged):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@241479 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-02-13 Jer Noble <jer.no...@apple.com>
+
+ Null-deref crash at SourceBufferPrivateAVFObjC::outputObscuredDueToInsufficientExternalProtectionChanged()
+ https://bugs.webkit.org/show_bug.cgi?id=194613
+ <rdar://problem/48023912>
+
+ Reviewed by Eric Carlson.
+
+ * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
+ (WebCore::SourceBufferPrivateAVFObjC::outputObscuredDueToInsufficientExternalProtectionChanged):
+
+2019-02-13 Babak Shafiei <bshaf...@apple.com>
+
Cherry-pick r241437. rdar://problem/48065626
[Cocoa] Switch to CVPixelBufferGetBytesPerRow() for calculating CVPixelBuffer base address size.
Modified: branches/safari-607-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (241506 => 241507)
--- branches/safari-607-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2019-02-14 08:34:31 UTC (rev 241506)
+++ branches/safari-607-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2019-02-14 08:34:34 UTC (rev 241507)
@@ -1009,7 +1009,7 @@
void SourceBufferPrivateAVFObjC::outputObscuredDueToInsufficientExternalProtectionChanged(bool obscured)
{
#if ENABLE(ENCRYPTED_MEDIA) && HAVE(AVCONTENTKEYSESSION)
- if (m_mediaSource->cdmInstance()) {
+ if (m_mediaSource && m_mediaSource->cdmInstance()) {
m_mediaSource->outputObscuredDueToInsufficientExternalProtectionChanged(obscured);
return;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
