Changeset 232202 in webkit

Timestamp:

May 25, 2018 2:35:13 PM (6 years ago)

Author:

eric.carlson@apple.com

Message:

Encode ISOWebVTTCue "strings" when logging
​https://bugs.webkit.org/show_bug.cgi?id=185991
<rdar://problem/40563902>

Reviewed by Jer Noble.

• platform/graphics/iso/ISOVTTCue.cpp:

(WebCore::ISOWebVTTCue::toJSONString const): Use encodeWithURLEscapeSequences for all Strings
taken from ISO boxes.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/iso/ISOVTTCue.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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 Jer Noble.
+
+        * platform/graphics/iso/ISOVTTCue.cpp:
+        (WebCore::ISOWebVTTCue::toJSONString const): Use encodeWithURLEscapeSequences for all Strings
+        taken from ISO boxes.
+
 2018-05-25  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/platform/graphics/iso/ISOVTTCue.cpp

@@ -28 +28 @@
 
 #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;
@@ -60 +54 @@
 
         Vector<LChar> characters;
-        characters.reserveInitialCapacity((size_t)characterCount);
+        characters.reserveInitialCapacity(static_cast<size_t>(characterCount));
         while (characterCount--) {
             int8_t character = 0;
@@ -118 +112 @@
     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());