Title: [237066] trunk/Source/WebCore
- Revision
- 237066
- Author
- jer.no...@apple.com
- Date
- 2018-10-12 08:28:14 -0700 (Fri, 12 Oct 2018)
Log Message
Null-dereference in SourceBufferPrivateAVFObjC::outputObscuredDueToInsufficientExternalProtectionChanged
https://bugs.webkit.org/show_bug.cgi?id=190490
<rdar://problem/42213807>
Reviewed by Eric Carlson.
Crash analytics show a null dereference occurring, likely because m_mediaSource is null.
* platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
(WebCore::SourceBufferPrivateAVFObjC::outputObscuredDueToInsufficientExternalProtectionChanged):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (237065 => 237066)
--- trunk/Source/WebCore/ChangeLog 2018-10-12 06:33:57 UTC (rev 237065)
+++ trunk/Source/WebCore/ChangeLog 2018-10-12 15:28:14 UTC (rev 237066)
@@ -1,3 +1,16 @@
+2018-10-12 Jer Noble <jer.no...@apple.com>
+
+ Null-dereference in SourceBufferPrivateAVFObjC::outputObscuredDueToInsufficientExternalProtectionChanged
+ https://bugs.webkit.org/show_bug.cgi?id=190490
+ <rdar://problem/42213807>
+
+ Reviewed by Eric Carlson.
+
+ Crash analytics show a null dereference occurring, likely because m_mediaSource is null.
+
+ * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
+ (WebCore::SourceBufferPrivateAVFObjC::outputObscuredDueToInsufficientExternalProtectionChanged):
+
2018-10-11 Don Olmstead <don.olmst...@sony.com>
Add Houdini specs to features.json
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (237065 => 237066)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2018-10-12 06:33:57 UTC (rev 237065)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2018-10-12 15:28:14 UTC (rev 237066)
@@ -979,8 +979,9 @@
void SourceBufferPrivateAVFObjC::outputObscuredDueToInsufficientExternalProtectionChanged(bool obscured)
{
#if ENABLE(ENCRYPTED_MEDIA) && HAVE(AVCONTENTKEYSESSION)
- if (m_mediaSource->player()->cdmInstance()) {
- m_mediaSource->player()->outputObscuredDueToInsufficientExternalProtectionChanged(obscured);
+ auto player = m_mediaSource ? m_mediaSource->player() : nullptr;
+ if (player && player->cdmInstance()) {
+ player->outputObscuredDueToInsufficientExternalProtectionChanged(obscured);
return;
}
#else
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
