Changeset 231872 in webkit

Timestamp:

May 16, 2018 2:23:29 PM (6 years ago)

Author:

jer.noble@apple.com

Message:

CRASH: Exception thrown from -[AVContentKeySession processContentKeyRequestWithIdentifier:initializationData:options:] after -expire called
​https://bugs.webkit.org/show_bug.cgi?id=185690
<rdar://problem/38297768>

Reviewed by Eric Carlson.

Reject all calls to update() after close() has been called on the session.

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

(WebCore::CDMSessionAVContentKeySession::update):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-05-16  Jer Noble  <jer.noble@apple.com>
+
+        CRASH: Exception thrown from -[AVContentKeySession processContentKeyRequestWithIdentifier:initializationData:options:] after -expire called
+        https://bugs.webkit.org/show_bug.cgi?id=185690
+        <rdar://problem/38297768>
+
+        Reviewed by Eric Carlson.
+
+        Reject all calls to update() after close() has been called on the session.
+
+        * platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm:
+        (WebCore::CDMSessionAVContentKeySession::update):
+
 2018-05-16  Andy VanWagoner  <andy@vanwagoner.family>
 

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

@@ -238 +238 @@
     UNUSED_PARAM(nextMessage);
 
+    if (m_stopped) {
+        errorCode = MediaPlayer::InvalidPlayerState;
+        return false;
+    }
+
     bool shouldGenerateKeyRequest = !m_certificate || isEqual(key, "renew");
     if (!m_certificate) {