Attachment 340509 Details for Bug 185690 – Patch

[patch] Patch

bug-185690-20180516114721.patch (text/plain), 1.83 KB, created by Jer Noble on 2018-05-16 11:47:23 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jer Noble

Created: 2018-05-16 11:47:23 PDT

Size: 1.83 KB

patch

obsolete

>Subversion Revision: 231813
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d1f1c85368ba0b16fbcbe2f9263b0ead47d8c64a..a8a3f169dc232baef8362496f5536b2518762b6a 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+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 NOBODY (OOPS!).
>+
>+        Reject all calls to update() after close() has been called on the session.
>+
>+        * platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm:
>+        (WebCore::CDMSessionAVContentKeySession::update):
>+
> 2018-05-09  Jer Noble  <jer.noble@apple.com>
> 
>         Media continues loading after rendered invisible (removed from DOM; scrolled off screen)
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm b/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm
>index 7e70239bdfcce465a9e5b0623dc1b13c55b23ca1..8ec647d92743284f46f6a1dae1cb5bbe05d8e848 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm
>@@ -237,6 +237,11 @@ bool CDMSessionAVContentKeySession::update(Uint8Array* key, RefPtr<Uint8Array>&
> {
>     UNUSED_PARAM(nextMessage);
> 
>+    if (m_stopped) {
>+        errorCode = MediaPlayer::InvalidPlayerState;
>+        return false;
>+    }
>+
>     bool shouldGenerateKeyRequest = !m_certificate || isEqual(key, "renew");
>     if (!m_certificate) {
>         LOG(Media, "CDMSessionAVContentKeySession::update(%p) - certificate data", this);

Actions: View | Formatted Diff | Diff

Attachments on bug 185690: 340509