Changeset 198585 in webkit

Timestamp:

Mar 23, 2016, 8:53:52 AM (9 years ago)

Author:

timothy@apple.com

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.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Base/Utilities.js (modified) (1 diff)
• UserInterface/Views/FormattedValue.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2016-03-22  Timothy Hatcher  <timothy@apple.com>
+
+        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  <pecoraro@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js

@@ -1199 +1199 @@
 function doubleQuotedString(str)
 {
-    return "\"" + str.replace(/"/g, "\\\"") + "\"";
+    return "\"" + str.replace(/\\/g, "\\\\").replace(/"/g, "\\\"") + "\"";
 }
 

trunk/Source/WebInspectorUI/UserInterface/Views/FormattedValue.js

@@ -40 +40 @@
     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;
 };