<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[260887] trunk/Source</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/260887">260887</a></dd>
<dt>Author</dt> <dd>drousso@apple.com</dd>
<dt>Date</dt> <dd>2020-04-29 01:23:06 -0700 (Wed, 29 Apr 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: Uncaught Exception: SyntaxError: Unexpected identifier 'E'. Expected either a closing ']' or a ',' following an array element.
https://bugs.webkit.org/show_bug.cgi?id=211163

Reviewed by Joseph Pecoraro.

Source/WebKit:

* WebProcess/Inspector/WebInspectorUI.cpp:
(WebKit::WebInspectorUI::updateFindString):
* WebProcess/Inspector/RemoteWebInspectorUI.cpp:
(WebKit::RemoteWebInspectorUI::updateFindString):
Use the newly exposed `JSON::Value::escapeString` to ensure that the `findString` will not
throw a JavaScript exception when placed in the `InspectorFrontendAPI` call.

Source/WTF:

* wtf/JSONValues.h:
* wtf/JSONValues.cpp:
(WTF::JSONImpl::appendDoubleQuotedString):
(WTF::JSONImpl::Value::escapeString): Added.
Pull out and expose the logic for escaping strings so it can be used elsewhere.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfJSONValuescpp">trunk/Source/WTF/wtf/JSONValues.cpp</a></li>
<li><a href="#trunkSourceWTFwtfJSONValuesh">trunk/Source/WTF/wtf/JSONValues.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebProcessInspectorRemoteWebInspectorUIcpp">trunk/Source/WebKit/WebProcess/Inspector/RemoteWebInspectorUI.cpp</a></li>
<li><a href="#trunkSourceWebKitWebProcessInspectorWebInspectorUIcpp">trunk/Source/WebKit/WebProcess/Inspector/WebInspectorUI.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (260886 => 260887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog       2020-04-29 08:14:06 UTC (rev 260886)
+++ trunk/Source/WTF/ChangeLog  2020-04-29 08:23:06 UTC (rev 260887)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2020-04-29  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Uncaught Exception: SyntaxError: Unexpected identifier 'E'. Expected either a closing ']' or a ',' following an array element.
+        https://bugs.webkit.org/show_bug.cgi?id=211163
+
+        Reviewed by Joseph Pecoraro.
+
+        * wtf/JSONValues.h:
+        * wtf/JSONValues.cpp:
+        (WTF::JSONImpl::appendDoubleQuotedString):
+        (WTF::JSONImpl::Value::escapeString): Added.
+        Pull out and expose the logic for escaping strings so it can be used elsewhere.
+
</ins><span class="cx"> 2020-04-29  Saam Barati  <sbarati@apple.com>
</span><span class="cx"> 
</span><span class="cx">         U_STRING_NOT_TERMINATED_WARNING ICU must be handled when using the output buffer as a C string
</span></span></pre></div>
<a id="trunkSourceWTFwtfJSONValuescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/JSONValues.cpp (260886 => 260887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/JSONValues.cpp      2020-04-29 08:14:06 UTC (rev 260886)
+++ trunk/Source/WTF/wtf/JSONValues.cpp 2020-04-29 08:23:06 UTC (rev 260887)
</span><span class="lines">@@ -453,42 +453,7 @@
</span><span class="cx"> inline void appendDoubleQuotedString(StringBuilder& builder, StringView string)
</span><span class="cx"> {
</span><span class="cx">     builder.append('"');
</span><del>-    for (UChar codeUnit : string.codeUnits()) {
-        switch (codeUnit) {
-        case '\b':
-            builder.appendLiteral("\\b");
-            continue;
-        case '\f':
-            builder.appendLiteral("\\f");
-            continue;
-        case '\n':
-            builder.appendLiteral("\\n");
-            continue;
-        case '\r':
-            builder.appendLiteral("\\r");
-            continue;
-        case '\t':
-            builder.appendLiteral("\\t");
-            continue;
-        case '\\':
-            builder.appendLiteral("\\\\");
-            continue;
-        case '"':
-            builder.appendLiteral("\\\"");
-            continue;
-        }
-        // We escape < and > to prevent script execution.
-        if (codeUnit >= 32 && codeUnit < 127 && codeUnit != '<' && codeUnit != '>') {
-            builder.append(codeUnit);
-            continue;
-        }
-        // We could encode characters >= 127 as UTF-8 instead of \u escape sequences.
-        // We could handle surrogates here if callers wanted that; for now we just
-        // write them out as a \u sequence, so a surrogate pair appears as two of them.
-        builder.append("\\u",
-            upperNibbleToASCIIHexDigit(codeUnit >> 8), lowerNibbleToASCIIHexDigit(codeUnit >> 8),
-            upperNibbleToASCIIHexDigit(codeUnit), lowerNibbleToASCIIHexDigit(codeUnit));
-    }
</del><ins>+    Value::escapeString(builder, string);
</ins><span class="cx">     builder.append('"');
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -560,6 +525,46 @@
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void Value::escapeString(StringBuilder& builder, StringView string)
+{
+    for (UChar codeUnit : string.codeUnits()) {
+        switch (codeUnit) {
+        case '\b':
+            builder.appendLiteral("\\b");
+            continue;
+        case '\f':
+            builder.appendLiteral("\\f");
+            continue;
+        case '\n':
+            builder.appendLiteral("\\n");
+            continue;
+        case '\r':
+            builder.appendLiteral("\\r");
+            continue;
+        case '\t':
+            builder.appendLiteral("\\t");
+            continue;
+        case '\\':
+            builder.appendLiteral("\\\\");
+            continue;
+        case '"':
+            builder.appendLiteral("\\\"");
+            continue;
+        }
+        // We escape < and > to prevent script execution.
+        if (codeUnit >= 32 && codeUnit < 127 && codeUnit != '<' && codeUnit != '>') {
+            builder.append(codeUnit);
+            continue;
+        }
+        // We could encode characters >= 127 as UTF-8 instead of \u escape sequences.
+        // We could handle surrogates here if callers wanted that; for now we just
+        // write them out as a \u sequence, so a surrogate pair appears as two of them.
+        builder.append("\\u",
+            upperNibbleToASCIIHexDigit(codeUnit >> 8), lowerNibbleToASCIIHexDigit(codeUnit >> 8),
+            upperNibbleToASCIIHexDigit(codeUnit), lowerNibbleToASCIIHexDigit(codeUnit));
+    }
+}
+
</ins><span class="cx"> String Value::toJSONString() const
</span><span class="cx"> {
</span><span class="cx">     StringBuilder result;
</span></span></pre></div>
<a id="trunkSourceWTFwtfJSONValuesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/JSONValues.h (260886 => 260887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/JSONValues.h        2020-04-29 08:14:06 UTC (rev 260886)
+++ trunk/Source/WTF/wtf/JSONValues.h   2020-04-29 08:23:06 UTC (rev 260887)
</span><span class="lines">@@ -108,6 +108,7 @@
</span><span class="cx">     virtual bool asArray(RefPtr<Array>&);
</span><span class="cx"> 
</span><span class="cx">     static bool parseJSON(const String& jsonInput, RefPtr<Value>& output);
</span><ins>+    static void escapeString(StringBuilder&, StringView);
</ins><span class="cx"> 
</span><span class="cx">     String toJSONString() const;
</span><span class="cx">     virtual void writeJSON(StringBuilder& output) const;
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (260886 => 260887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2020-04-29 08:14:06 UTC (rev 260886)
+++ trunk/Source/WebKit/ChangeLog       2020-04-29 08:23:06 UTC (rev 260887)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2020-04-29  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Uncaught Exception: SyntaxError: Unexpected identifier 'E'. Expected either a closing ']' or a ',' following an array element.
+        https://bugs.webkit.org/show_bug.cgi?id=211163
+
+        Reviewed by Joseph Pecoraro.
+
+        * WebProcess/Inspector/WebInspectorUI.cpp:
+        (WebKit::WebInspectorUI::updateFindString):
+        * WebProcess/Inspector/RemoteWebInspectorUI.cpp:
+        (WebKit::RemoteWebInspectorUI::updateFindString):
+        Use the newly exposed `JSON::Value::escapeString` to ensure that the `findString` will not
+        throw a JavaScript exception when placed in the `InspectorFrontendAPI` call.
+
</ins><span class="cx"> 2020-04-28  Carlos Garcia Campos  <cgarcia@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GTK4] Add support for key events
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessInspectorRemoteWebInspectorUIcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/Inspector/RemoteWebInspectorUI.cpp (260886 => 260887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/Inspector/RemoteWebInspectorUI.cpp        2020-04-29 08:14:06 UTC (rev 260886)
+++ trunk/Source/WebKit/WebProcess/Inspector/RemoteWebInspectorUI.cpp   2020-04-29 08:23:06 UTC (rev 260887)
</span><span class="lines">@@ -69,7 +69,9 @@
</span><span class="cx"> 
</span><span class="cx"> void RemoteWebInspectorUI::updateFindString(const String& findString)
</span><span class="cx"> {
</span><del>-    m_frontendAPIDispatcher.dispatchCommand("updateFindString"_s, findString);
</del><ins>+    StringBuilder builder;
+    JSON::Value::escapeString(builder, findString);
+    m_frontendAPIDispatcher.dispatchCommand("updateFindString"_s, builder.toString());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RemoteWebInspectorUI::didSave(const String& url)
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessInspectorWebInspectorUIcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/Inspector/WebInspectorUI.cpp (260886 => 260887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/Inspector/WebInspectorUI.cpp      2020-04-29 08:14:06 UTC (rev 260886)
+++ trunk/Source/WebKit/WebProcess/Inspector/WebInspectorUI.cpp 2020-04-29 08:23:06 UTC (rev 260887)
</span><span class="lines">@@ -271,7 +271,9 @@
</span><span class="cx"> 
</span><span class="cx"> void WebInspectorUI::updateFindString(const String& findString)
</span><span class="cx"> {
</span><del>-    m_frontendAPIDispatcher.dispatchCommand("updateFindString"_s, findString);
</del><ins>+    StringBuilder builder;
+    JSON::Value::escapeString(builder, findString);
+    m_frontendAPIDispatcher.dispatchCommand("updateFindString"_s, builder.toString());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebInspectorUI::changeAttachedWindowHeight(unsigned height)
</span></span></pre>
</div>
</div>

</body>
</html>