Changeset 271261 in webkit

Timestamp:

Jan 7, 2021, 2:40:14 PM (6 years ago)

Author:

eric.carlson@apple.com

Message:

[MSE] Fix potential crash in SourceBufferPrivateAVFObjC::destroyParser
​https://bugs.webkit.org/show_bug.cgi?id=220434

Reviewed by Jer Noble.

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

(WebCore::SourceBufferPrivateAVFObjC::destroyParser): NULL-check
m_mediaSource->player() before using it.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-01-07  Eric Carlson  <eric.carlson@apple.com>
+
+        [MSE] Fix potential crash in SourceBufferPrivateAVFObjC::destroyParser
+        https://bugs.webkit.org/show_bug.cgi?id=220434
+
+        Reviewed by Jer Noble.
+
+        * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
+        (WebCore::SourceBufferPrivateAVFObjC::destroyParser): NULL-check 
+        m_mediaSource->player() before using it.
+
 2021-01-07  Fujii Hironori  <Hironori.Fujii@sony.com>
 

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

@@ -625 +625 @@
         return;
 #if HAVE(AVSTREAMSESSION) && ENABLE(LEGACY_ENCRYPTED_MEDIA)
-    if (m_mediaSource && m_mediaSource->player()->hasStreamSession())
+    if (m_mediaSource && m_mediaSource->player() && m_mediaSource->player()->hasStreamSession())
         [m_mediaSource->player()->streamSession() removeStreamDataParser:parser];
 #endif