Skip to content
This repository has been archived by the owner on Nov 7, 2024. It is now read-only.

Fixes #32: Doubt about writeEscapedString() #70

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes #32: Doubt about writeEscapedString() #70

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 26 additions & 19 deletions impl/src/main/java/org/glassfish/json/JsonGeneratorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,50 +548,57 @@ public void close() {
// begin end begin end
void writeEscapedString(String string) {
writeChar('"');
int len = string.length();
for(int i = 0; i < len; i++) {
int begin = i, end = i;
char c = string.charAt(i);
int slen = string.length();
for(int i = 0; i < slen; i++) {
int cp = string.codePointAt(i);
int cc = Character.charCount(cp);
int begin = i, end = cc == 1 ? i : i + 1;

// find all the characters that need not be escaped
// unescaped = %x20-21 | %x23-5B | %x5D-10FFFF
while(c >= 0x20 && c <= 0x10ffff && c != 0x22 && c != 0x5c) {
i++; end = i;
if (i < len) {
c = string.charAt(i);
while(cp >= 0x20 && cp <= 0x10ffff && cp != 0x22 && cp != 0x5c) {
i += cc;
end = i;
if (i < slen) {
cp = string.codePointAt(i);
cc = Character.charCount(cp);
} else {
break;
}
}
// Write characters without escaping
if (begin < end) {
writeString(string, begin, end);
if (i == len) {
if (i == slen) {
break;
}
}

switch (c) {
case '"':
case '\\':
writeChar('\\'); writeChar(c);
switch (cp) {
case 0x22:
case 0x5c:
writeChar('\\'); writeChar((char) cp);
break;
case '\b':
case 0x8:
writeChar('\\'); writeChar('b');
break;
case '\f':
case 0xc:
writeChar('\\'); writeChar('f');
break;
case '\n':
case 0xa:
writeChar('\\'); writeChar('n');
break;
case '\r':
case 0xd:
writeChar('\\'); writeChar('r');
break;
case '\t':
case 0x9:
writeChar('\\'); writeChar('t');
break;
case 0xb:
writeChar('\\'); writeChar('v');
break;
default:
String hex = "000" + Integer.toHexString(c);
String hex = "000" + Integer.toHexString(cp);
writeString("\\u" + hex.substring(hex.length() - 4));
}
}
Expand Down