Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-24 19:25:15 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #349 from mikeprimm/master

Browse Source 
Make JSON unicode encoding more thorough - don't assume anything outside ASCII should not be escaped
This commit is contained in:
mikeprimm 2011-07-30 00:16:24 -07:00
commit 65f20df60c
1 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/java/org/dynmap/web/Json.java
View File

@ -15,13 +15,59 @@ public class Json {
return sb.toString();
}
public static void escape(String s, StringBuilder s2) {
for(int i=0;i<s.length();i++){
char ch=s.charAt(i);
switch(ch){
case '"':
s2.append("\\\"");
break;
case '\\':
s2.append("\\\\");
break;
case '\b':
s2.append("\\b");
break;
case '\f':
s2.append("\\f");
break;
case '\n':
s2.append("\\n");
break;
case '\r':
s2.append("\\r");
break;
case '\t':
s2.append("\\t");
break;
case '/':
s2.append("\\/");
break;
default:
if((ch>='\u0000' && ch<='\u001F') || (ch>='\u007F')){
String ss=Integer.toHexString(ch);
s2.append("\\u");
for(int k=0;k<4-ss.length();k++){
s2.append('0');
}
s2.append(ss.toUpperCase());
}
else{
s2.append(ch);
}
}
}//for
}
public static void appendJson(Object o, StringBuilder s) {
if (o == null) {
s.append("null");
} else if (o instanceof Boolean) {
s.append(((Boolean) o) ? "true" : "false");
} else if (o instanceof String) {
s.append("\"" + JSONObject.escape((String)o) + "\"");
s.append("\"");
escape((String)o, s);
s.append("\"");
} else if (o instanceof Integer || o instanceof Long || o instanceof Float || o instanceof Double) {
s.append(o.toString());
} else if (o instanceof Map<?, ?>) {