From 06f9755b5e18e5089040d107fd93e91394deab76 Mon Sep 17 00:00:00 2001 From: "igor%mir2.org" Date: Fri, 13 Dec 2002 11:56:54 +0000 Subject: [PATCH] Fix for http://bugzilla.mozilla.org/show_bug.cgi?id=185165 I made ScriptRuntime.escapeString to escape \ and remove code to escape single quote ' as it is unreachable due to if (' ' <= c && c <= '~' && c != '"' && c != '\\') check as ' should not be escaped. git-svn-id: svn://10.0.0.236/trunk@135242 18797224-902f-48f8-a5cc-f745e15eee43 --- .../js/rhino/src/org/mozilla/javascript/ScriptRuntime.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java b/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java index 084b15e1399..b4042cb9508 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java @@ -368,8 +368,9 @@ public class ScriptRuntime { for(int i = 0, L = s.length(); i != L; ++i) { int c = s.charAt(i); - if (' ' <= c && c <= '~' && c != '"') { + if (' ' <= c && c <= '~' && c != '"' && c != '\\') { // an ordinary print character (like C isprint()) and not " + // or \ . Note single quote ' is not escaped if (sb != null) { sb.append((char)c); } @@ -391,7 +392,7 @@ public class ScriptRuntime { case 0xb: escape = 'v'; break; // Java lacks \v. case '"': escape = '"'; break; case ' ': escape = ' '; break; - case '\'': escape = '\''; break; + case '\\': escape = '\\'; break; } if (escape >= 0) { // an \escaped sort of character