Re-enabling the ' (apostrophe) escaping with valid JSON escaping.
This commit is contained in:
parent
536a968b32
commit
c892738fbb
@ -54,9 +54,7 @@ class Escaper {
|
|||||||
htmlEscapeSet.add('>');
|
htmlEscapeSet.add('>');
|
||||||
htmlEscapeSet.add('&');
|
htmlEscapeSet.add('&');
|
||||||
htmlEscapeSet.add('=');
|
htmlEscapeSet.add('=');
|
||||||
// Removing ' for now since it is a valid character in JSON, but not javascript
|
htmlEscapeSet.add('\'');
|
||||||
// When enabling this, remember to enable the test EscaperTest.disable_testSingleQuoteEscaping
|
|
||||||
// htmlEscapeSet.add('\'');
|
|
||||||
// htmlEscapeSet.add('/'); -- Removing slash for now since it causes some incompatibilities
|
// htmlEscapeSet.add('/'); -- Removing slash for now since it causes some incompatibilities
|
||||||
HTML_ESCAPE_CHARS = Collections.unmodifiableSet(htmlEscapeSet);
|
HTML_ESCAPE_CHARS = Collections.unmodifiableSet(htmlEscapeSet);
|
||||||
}
|
}
|
||||||
@ -114,10 +112,7 @@ class Escaper {
|
|||||||
out.append("\\/");
|
out.append("\\/");
|
||||||
break;
|
break;
|
||||||
case '"':
|
case '"':
|
||||||
out.append('\\').append((char) codePoint);
|
out.append("\\\"");
|
||||||
break;
|
|
||||||
case '\'':
|
|
||||||
out.append('\\').append((char) codePoint);
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
appendHexJavaScriptRepresentation(codePoint, out);
|
appendHexJavaScriptRepresentation(codePoint, out);
|
||||||
|
@ -65,10 +65,10 @@ public class EscaperTest extends TestCase {
|
|||||||
assertEquals("123\\\"456", escapedString);
|
assertEquals("123\\\"456", escapedString);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void disable_testSingleQuoteEscaping() throws Exception {
|
public void testSingleQuoteEscaping() throws Exception {
|
||||||
String containsQuote = "123'456";
|
String containsQuote = "123'456";
|
||||||
String escapedString = escapeHtmlChar.escapeJsonString(containsQuote);
|
String escapedString = escapeHtmlChar.escapeJsonString(containsQuote);
|
||||||
assertEquals("123\\'456", escapedString);
|
assertEquals("123\\u0027456", escapedString);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testLineSeparatorEscaping() throws Exception {
|
public void testLineSeparatorEscaping() throws Exception {
|
||||||
|
Loading…
Reference in New Issue
Block a user