Changeset 260815 in webkit

Timestamp:

Apr 28, 2020 3:58:24 AM (4 years ago)

Author:

cturner@igalia.com

Message:

[EME][CDMProxy] Default initialize m_numDecryptorsWaitingForKey member
​https://bugs.webkit.org/show_bug.cgi?id=210970

Reviewed by Xabier Rodriguez-Calvar.

This was causing non-deterministic reads of the
m_numDecryptorsWaitingForKey member. Sometimes a waiting for key
event would fail to fire and cause test failures. I thought
std::atomic<int> would default initialize to zero, but after
spec-diving I realise now I was wrong about that.

Test: encrypted-media/clearkey-mp4-waiting-for-a-key.https.html

• platform/encryptedmedia/CDMProxy.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/encryptedmedia/CDMProxy.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-28  Charlie Turner  <cturner@igalia.com>
+
+        [EME][CDMProxy] Default initialize m_numDecryptorsWaitingForKey member
+        https://bugs.webkit.org/show_bug.cgi?id=210970
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        This was causing non-deterministic reads of the
+        m_numDecryptorsWaitingForKey member. Sometimes a waiting for key
+        event would fail to fire and cause test failures. I thought
+        std::atomic<int> would default initialize to zero, but after
+        spec-diving I realise now I was wrong about that.
+
+        Test: encrypted-media/clearkey-mp4-waiting-for-a-key.https.html
+
+        * platform/encryptedmedia/CDMProxy.h:
+
 2020-04-28  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/platform/encryptedmedia/CDMProxy.h

@@ -195 +195 @@
     MediaPlayer* m_player { nullptr }; // FIXME: MainThread<T>?
 
-    std::atomic<int> m_numDecryptorsWaitingForKey;
+    std::atomic<int> m_numDecryptorsWaitingForKey { 0 };
     Vector<RefPtr<CDMInstanceSession>> m_sessions;