Attachment 371322 Details for Bug 198539 – Patch

[patch] Patch

bug-198539-20190604130235.patch (text/plain), 2.36 KB, created by Keith Rollin on 2019-06-04 13:02:36 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Keith Rollin

Created: 2019-06-04 13:02:36 PDT

Size: 2.36 KB

patch

obsolete

>Subversion Revision: 246050
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 5af36a3d40fa15123f63b194449b56e02a38486f..dc1c53903886811abd1dd1d96bce78587aa33d6f 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,26 @@
>+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 NOBODY (OOPS!).
>+
>+        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-03  Keith Rollin  <krollin@apple.com>
> 
>         Fix 32-bit/64-bit mismatch in PointerCaptureController::elementWasRemoved
>diff --git a/Source/WebCore/platform/graphics/avfoundation/ISOFairPlayStreamingPsshBox.cpp b/Source/WebCore/platform/graphics/avfoundation/ISOFairPlayStreamingPsshBox.cpp
>index 9f0babd966b8a464b8847a06ef4fb5cb08d14957..f33944d1850403e91502e0603f54fb7b2b46e4fc 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/ISOFairPlayStreamingPsshBox.cpp
>+++ b/Source/WebCore/platform/graphics/avfoundation/ISOFairPlayStreamingPsshBox.cpp
>@@ -88,7 +88,7 @@ bool ISOFairPlayStreamingKeyAssetIdBox::parse(JSC::DataView& view, unsigned& off
>     if (!buffer)
>         return false;
> 
>-    uint64_t dataSize;
>+    size_t dataSize;
>     if (!WTF::safeSub(m_size, localOffset - offset, dataSize))
>         return false;
> 
>@@ -117,7 +117,7 @@ bool ISOFairPlayStreamingKeyContextBox::parse(JSC::DataView& view, unsigned& off
>     if (!buffer)
>         return false;
> 
>-    uint64_t dataSize;
>+    size_t dataSize;
>     if (!WTF::safeSub(m_size, localOffset - offset, dataSize))
>         return false;
>

Actions: View | Formatted Diff | Diff

Attachments on bug 198539: 371322