Title: [196083] trunk/Source/WebCore
- Revision
- 196083
- Author
- [email protected]
- Date
- 2016-02-03 14:59:39 -0800 (Wed, 03 Feb 2016)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (196082 => 196083)
--- trunk/Source/WebCore/ChangeLog 2016-02-03 22:57:43 UTC (rev 196082)
+++ trunk/Source/WebCore/ChangeLog 2016-02-03 22:59:39 UTC (rev 196083)
@@ -1,5 +1,19 @@
2016-02-03 Jer Noble <[email protected]>
+ [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 <[email protected]>
+
[Mac] Wrap a resource and resource loader in a NSURLSession-like object for use by lower level frameworks
https://bugs.webkit.org/show_bug.cgi?id=153669
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (196082 => 196083)
--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2016-02-03 22:57:43 UTC (rev 196082)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2016-02-03 22:59:39 UTC (rev 196083)
@@ -1042,7 +1042,7 @@
if (!status || offset + keyIDLength > initData->length())
return false;
- RefPtr<Uint16Array> keyIDArray = Uint16Array::create(initDataBuffer, offset, keyIDLength);
+ RefPtr<Uint8Array> keyIDArray = Uint8Array::create(initDataBuffer, offset, keyIDLength);
if (!keyIDArray)
return false;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
