lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复将null开头的字符串(例如nullaxx)都视为null的BUG

Browse Source
This commit is contained in:
Redkale
2017-11-11 23:57:45 +08:00
parent 98a6c3ef79
commit 6fddd8b53b
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/org/redkale/convert/json/JsonReader.java
View File

@@ -476,16 +476,10 @@ public class JsonReader extends Reader {
} }
} }
if (expected != '"' && expected != '\'') { if (expected != '"' && expected != '\'') {
if (expected == 'n' && text0.length > currpos + 3 && (text0[1 + currpos] == 'u' && text0[2 + currpos] == 'l' && text0[3 + currpos] == 'l')) { if (expected == 'n' && ((text0.length == currpos + 4 && (text0[1 + currpos] == 'u' && text0[2 + currpos] == 'l' && text0[3 + currpos] == 'l'))
if (text0[++currpos] == 'u' && text0[++currpos] == 'l' && text0[++currpos] == 'l') { || (text0.length > currpos + 4 && (text0[1 + currpos] == 'u' && text0[2 + currpos] == 'l' && text0[3 + currpos] == 'l')
this.position = currpos; && (text0[4 + currpos] == ',' || text0[4 + currpos] <= ' ' || text0[4 + currpos] == '}' || text0[4 + currpos] == ']' || text0[4 + currpos] == ':')))) {
if (text0.length > currpos + 4) {
char ch = text0[currpos + 1];
if (ch == ',' || ch <= ' ' || ch == '}' || ch == ']' || ch == ':') return null;
} else {
return null; return null;
}
}
} else { } else {
final int start = currpos; final int start = currpos;
for (;;) { for (;;) {
@@ -498,8 +492,8 @@ public class JsonReader extends Reader {
this.position = currpos - 1; this.position = currpos - 1;
return new String(text0, start, currpos - start); return new String(text0, start, currpos - start);
} }
this.position = currpos; //this.position = currpos;
throw new ConvertException("expected a ':' after a key but '" + text0[position] + "' (position = " + position + ") in (" + new String(this.text) + ")"); //throw new ConvertException("expected a ':' after a key but '" + text0[position] + "' (position = " + position + ") in (" + new String(this.text) + ")");
} }
final int start = ++currpos; final int start = ++currpos;
for (;;) { for (;;) {