Title: [198585] trunk/Source/WebInspectorUI
Revision
198585
Author
[email protected]
Date
2016-03-23 08:53:52 -0700 (Wed, 23 Mar 2016)

Log Message

Web Inspector: String double quoting in the console and elsewhere needs to escape backslash too

https://bugs.webkit.org/show_bug.cgi?id=155752
rdar://problem/25293141

Reviewed by Joseph Pecoraro.

* UserInterface/Base/Utilities.js:
(doubleQuotedString): Escape backslashes too.
* UserInterface/Views/FormattedValue.js:
(WebInspector.FormattedValue.createLinkifiedElementString): Ditto.

Modified Paths

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (198584 => 198585)


--- trunk/Source/WebInspectorUI/ChangeLog	2016-03-23 14:16:17 UTC (rev 198584)
+++ trunk/Source/WebInspectorUI/ChangeLog	2016-03-23 15:53:52 UTC (rev 198585)
@@ -1,3 +1,17 @@
+2016-03-22  Timothy Hatcher  <[email protected]>
+
+        Web Inspector: String double quoting in the console and elsewhere needs to escape backslash too
+
+        https://bugs.webkit.org/show_bug.cgi?id=155752
+        rdar://problem/25293141
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Base/Utilities.js:
+        (doubleQuotedString): Escape backslashes too.
+        * UserInterface/Views/FormattedValue.js:
+        (WebInspector.FormattedValue.createLinkifiedElementString): Ditto.
+
 2016-03-22  Joseph Pecoraro  <[email protected]>
 
         Web Inspector: REGRESSION: Switching Timelines via Path Component does not work

Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js (198584 => 198585)


--- trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js	2016-03-23 14:16:17 UTC (rev 198584)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js	2016-03-23 15:53:52 UTC (rev 198585)
@@ -1198,7 +1198,7 @@
 
 function doubleQuotedString(str)
 {
-    return "\"" + str.replace(/"/g, "\\\"") + "\"";
+    return "\"" + str.replace(/\\/g, "\\\\").replace(/"/g, "\\\"") + "\"";
 }
 
 function insertionIndexForObjectInListSortedByFunction(object, list, comparator, insertionIndexAfter)

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FormattedValue.js (198584 => 198585)


--- trunk/Source/WebInspectorUI/UserInterface/Views/FormattedValue.js	2016-03-23 14:16:17 UTC (rev 198584)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FormattedValue.js	2016-03-23 15:53:52 UTC (rev 198585)
@@ -39,7 +39,7 @@
 {
     var span = document.createElement("span");
     span.className = "formatted-string";
-    span.append("\"", WebInspector.linkifyStringAsFragment(string.replace(/"/g, "\\\"")), "\"");
+    span.append("\"", WebInspector.linkifyStringAsFragment(string.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")), "\"");
     return span;
 };
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to