Changeset 246092 in webkit

Timestamp:

Jun 4, 2019, 5:40:35 PM (7 years ago)

Author:

Keith Rollin

Message:

Fix 64-bit vs 32-bit mismatch in ISOFairPlayStreamingPsshBox.cpp
​https://bugs.webkit.org/show_bug.cgi?id=198539
<rdar://problem/51410358>

Reviewed by Alex Christensen.

Both ISOFairPlayStreamingKeyAssetIdBox and
ISOFairPlayStreamingKeyContextBox have Vector<> data members. The
parse() members of these classes call Vector<>::resize() on these
members. In both cases, the type of the parameter passed is a
uint64_t. However, resize() takes a size_t. On some platforms, size_t
is a 32-bit value, leading to a compile-time type mismatch error. Fix
this by changing the type of the value passed to parse() into a
size_t.

No new tests -- no new functionality.

• platform/graphics/avfoundation/ISOFairPlayStreamingPsshBox.cpp:

(WebCore::ISOFairPlayStreamingKeyAssetIdBox::parse):
(WebCore::ISOFairPlayStreamingKeyContextBox::parse):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/ISOFairPlayStreamingPsshBox.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-04  Keith Rollin  <krollin@apple.com>
+
+        Fix 64-bit vs 32-bit mismatch in ISOFairPlayStreamingPsshBox.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=198539
+        <rdar://problem/51410358>
+
+        Reviewed by Alex Christensen.
+
+        Both ISOFairPlayStreamingKeyAssetIdBox and
+        ISOFairPlayStreamingKeyContextBox have Vector<> data members. The
+        parse() members of these classes call Vector<>::resize() on these
+        members. In both cases, the type of the parameter passed is a
+        uint64_t. However, resize() takes a size_t. On some platforms, size_t
+        is a 32-bit value, leading to a compile-time type mismatch error. Fix
+        this by changing the type of the value passed to parse() into a
+        size_t.
+
+        No new tests -- no new functionality.
+
+        * platform/graphics/avfoundation/ISOFairPlayStreamingPsshBox.cpp:
+        (WebCore::ISOFairPlayStreamingKeyAssetIdBox::parse):
+        (WebCore::ISOFairPlayStreamingKeyContextBox::parse):
+
 2019-06-04  Keith Rollin  <krollin@apple.com>
 

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

@@ -89 +89 @@
         return false;
 
-    uint64_t dataSize;
+    size_t dataSize;
     if (!WTF::safeSub(m_size, localOffset - offset, dataSize))
         return false;
@@ -118 +118 @@
         return false;
 
-    uint64_t dataSize;
+    size_t dataSize;
     if (!WTF::safeSub(m_size, localOffset - offset, dataSize))
         return false;