Attachment 341320 Details for Bug 185991 – Patch

[patch] Patch

bug-185991-20180525133714.patch (text/plain), 2.89 KB, created by Eric Carlson on 2018-05-25 13:37:15 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Carlson

Created: 2018-05-25 13:37:15 PDT

Size: 2.89 KB

patch

obsolete

>Subversion Revision: 232164
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 0df47a50d46ba4bff665c7b1be935846e9f277c4..2d47d0808940cf9e81ac3534433ea78fa8d7718f 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-05-25  Eric Carlson  <eric.carlson@apple.com>
>+
>+        Encode ISOWebVTTCue "strings" when logging
>+        https://bugs.webkit.org/show_bug.cgi?id=185991
>+        <rdar://problem/40563902>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/graphics/iso/ISOVTTCue.cpp:
>+        (WebCore::ISOWebVTTCue::toJSONString const): Use encodeWithURLEscapeSequences for all Strings
>+        taken from ISO boxes.
>+
> 2018-05-24  Chris Dumez  <cdumez@apple.com>
> 
>         Cache navigator.userAgent for performance
>diff --git a/Source/WebCore/platform/graphics/iso/ISOVTTCue.cpp b/Source/WebCore/platform/graphics/iso/ISOVTTCue.cpp
>index 923880de9bc1ed406cacae9fdc08bd8bda17bbce..f8ebf9f7b5c27162b7e8ccfb9868801f85d57c5d 100644
>--- a/Source/WebCore/platform/graphics/iso/ISOVTTCue.cpp
>+++ b/Source/WebCore/platform/graphics/iso/ISOVTTCue.cpp
>@@ -27,15 +27,9 @@
> #include "ISOVTTCue.h"
> 
> #include "Logging.h"
>-#include <JavaScriptCore/ArrayBuffer.h>
>+#include "URL.h"
> #include <JavaScriptCore/DataView.h>
>-#include <JavaScriptCore/Int8Array.h>
>-#include <JavaScriptCore/JSCInlines.h>
>-#include <JavaScriptCore/TypedArrayInlines.h>
> #include <wtf/JSONValues.h>
>-#include <wtf/NeverDestroyed.h>
>-#include <wtf/text/CString.h>
>-#include <wtf/text/StringBuilder.h>
> 
> using JSC::DataView;
> 
>@@ -59,7 +53,7 @@ protected:
>         }
> 
>         Vector<LChar> characters;
>-        characters.reserveInitialCapacity((size_t)characterCount);
>+        characters.reserveInitialCapacity(static_cast<size_t>(characterCount));
>         while (characterCount--) {
>             int8_t character = 0;
>             if (!checkedRead<int8_t>(character, view, localOffset, BigEndian))
>@@ -117,12 +111,11 @@ String ISOWebVTTCue::toJSONString() const
> #if !LOG_DISABLED
>     object->setString(ASCIILiteral("text"), m_cueText);
> #endif
>-    object->setString(ASCIILiteral("sourceId"), m_sourceID);
>-    object->setString(ASCIILiteral("id"), m_identifier);
>+    object->setString(ASCIILiteral("sourceId"), encodeWithURLEscapeSequences(m_sourceID));
>+    object->setString(ASCIILiteral("id"), encodeWithURLEscapeSequences(m_identifier));
> 
>-    object->setString(ASCIILiteral("originalStartTime"), m_originalStartTime);
>-    object->setString(ASCIILiteral("settings"), m_settings);
>-    object->setString(ASCIILiteral("cueText"), m_cueText);
>+    object->setString(ASCIILiteral("originalStartTime"), encodeWithURLEscapeSequences(m_originalStartTime));
>+    object->setString(ASCIILiteral("settings"), encodeWithURLEscapeSequences(m_settings));
> 
>     object->setDouble(ASCIILiteral("presentationTime"), m_presentationTime.toDouble());
>     object->setDouble(ASCIILiteral("duration"), m_duration.toDouble());

Actions: View | Formatted Diff | Diff

Attachments on bug 185991: 341320