From 709b9edc324f90ce80ce7836cf1848da74b43329 Mon Sep 17 00:00:00 2001
From: Joseph Pecoraro <pecoraro@apple.com>
Date: Wed, 24 Jan 2018 09:35:54 +0000
Subject: [PATCH] Merge r222762 - Web Inspector: Escape more characters in
 posix string conversion https://bugs.webkit.org/show_bug.cgi?id=177761
 <rdar://problem/34506832>

Patch by Joseph Pecoraro <pecoraro@apple.com> on 2017-10-02
Reviewed by Brian Burg.

* UserInterface/Models/Resource.js:
(WI.Resource.prototype.generateCURLCommand.escapeStringPosix):
Escape '!' to '\041' in posix strings ($'...') since '!' may have special behavior at times.
---
 Source/WebInspectorUI/ChangeLog                      | 12 ++++++++++++
 .../WebInspectorUI/UserInterface/Models/Resource.js  |  1 +
 2 files changed, 13 insertions(+)

diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
index 7bc79245d606..e956b8ae9c1e 100644
--- a/Source/WebInspectorUI/ChangeLog
+++ b/Source/WebInspectorUI/ChangeLog
@@ -1,3 +1,15 @@
+2017-10-02  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Escape more characters in posix string conversion
+        https://bugs.webkit.org/show_bug.cgi?id=177761
+        <rdar://problem/34506832>
+
+        Reviewed by Brian Burg.
+
+        * UserInterface/Models/Resource.js:
+        (WI.Resource.prototype.generateCURLCommand.escapeStringPosix):
+        Escape '!' to '\041' in posix strings ($'...') since '!' may have special behavior at times.
+
 2017-09-08  Joseph Pecoraro  <pecoraro@apple.com>
 
         Uncaught Exception: TypeError: this._heapSnapshot.addEventListener is not a function.
diff --git a/Source/WebInspectorUI/UserInterface/Models/Resource.js b/Source/WebInspectorUI/UserInterface/Models/Resource.js
index 4553234304d2..a41695d8c816 100644
--- a/Source/WebInspectorUI/UserInterface/Models/Resource.js
+++ b/Source/WebInspectorUI/UserInterface/Models/Resource.js
@@ -949,6 +949,7 @@ WI.Resource = class Resource extends WI.SourceCode
                                  .replace(/'/g, "\\'")
                                  .replace(/\n/g, "\\n")
                                  .replace(/\r/g, "\\r")
+                                 .replace(/!/g, "\\041")
                                  .replace(/[^\x20-\x7E]/g, escapeCharacter) + "'";
             } else {
                 // Use single quote syntax.