Title: [246092] trunk/Source/WebCore
- Revision
- 246092
- Author
- [email protected]
- Date
- 2019-06-04 17:40:35 -0700 (Tue, 04 Jun 2019)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (246091 => 246092)
--- trunk/Source/WebCore/ChangeLog 2019-06-05 00:26:10 UTC (rev 246091)
+++ trunk/Source/WebCore/ChangeLog 2019-06-05 00:40:35 UTC (rev 246092)
@@ -1,5 +1,28 @@
2019-06-04 Keith Rollin <[email protected]>
+ 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 <[email protected]>
+
Fix 64-bit vs 32-bit mismatch in TileController.cpp
https://bugs.webkit.org/show_bug.cgi?id=198540
<rdar://problem/51410851>
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/ISOFairPlayStreamingPsshBox.cpp (246091 => 246092)
--- trunk/Source/WebCore/platform/graphics/avfoundation/ISOFairPlayStreamingPsshBox.cpp 2019-06-05 00:26:10 UTC (rev 246091)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/ISOFairPlayStreamingPsshBox.cpp 2019-06-05 00:40:35 UTC (rev 246092)
@@ -88,7 +88,7 @@
if (!buffer)
return false;
- uint64_t dataSize;
+ size_t dataSize;
if (!WTF::safeSub(m_size, localOffset - offset, dataSize))
return false;
@@ -117,7 +117,7 @@
if (!buffer)
return false;
- uint64_t dataSize;
+ size_t dataSize;
if (!WTF::safeSub(m_size, localOffset - offset, dataSize))
return false;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
