Changeset 196083 in webkit

Timestamp:

Feb 3, 2016 2:59:39 PM (8 years ago)

Author:

jer.noble@apple.com

Message:

[EME][Mac] MediaKeys.createSession() fails with initData containing a contentId whose length is > 1/2 the initData.
​https://bugs.webkit.org/show_bug.cgi?id=153517
<rdar://problem/24303782>

Reviewed by Eric Carlson.

The length of contentId is given in bytes, not Uint16 characters. Use the former when extracting
the contentId string from the initData.

• platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:

(WebCore::MediaPlayerPrivateAVFoundation::extractKeyURIKeyIDAndCertificateFromInitData):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-02-03  Jer Noble  <jer.noble@apple.com>
+
+        [EME][Mac] MediaKeys.createSession() fails with initData containing a contentId whose length is > 1/2 the initData.
+        https://bugs.webkit.org/show_bug.cgi?id=153517
+        <rdar://problem/24303782>
+
+        Reviewed by Eric Carlson.
+
+        The length of contentId is given in bytes, not Uint16 characters. Use the former when extracting
+        the contentId string from the initData.
+
+        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+        (WebCore::MediaPlayerPrivateAVFoundation::extractKeyURIKeyIDAndCertificateFromInitData):
+
 2016-02-03  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp

@@ -1043 +1043 @@
         return false;
 
-    RefPtr<Uint16Array> keyIDArray = Uint16Array::create(initDataBuffer, offset, keyIDLength);
+    RefPtr<Uint8Array> keyIDArray = Uint8Array::create(initDataBuffer, offset, keyIDLength);
     if (!keyIDArray)
         return false;