Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enhance null handling to check case 'n' in issue 357 #358

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

enhance null handling to check case 'n' in issue 357 #358

Show file tree
Hide file tree
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
9 changes: 7 additions & 2 deletions src/main/java/com/jsoniter/IterImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,13 @@ public static Any readAny(JsonIterator iter) throws IOException {
skipFixedBytes(iter, 4);
return Any.wrap(false);
case 'n':
skipFixedBytes(iter, 3);
return Any.wrap((Object) null);
if (readByte(iter) == 'u' &&
readByte(iter) == 'l' &&
readByte(iter) == 'l') {
return Any.wrap((Object) null);
} else {
throw iter.reportError("readAny", "expected 'null' but found something else");
}
case '[':
skipArray(iter);
return Any.lazyArray(iter.buf, start, iter.head);
Expand Down
12 changes: 9 additions & 3 deletions src/main/java/com/jsoniter/IterImplForStreaming.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,9 +334,15 @@ public static Any readAny(JsonIterator iter) throws IOException {
iter.skipStartedAt = -1;
return Any.wrap(false);
case 'n':
skipFixedBytes(iter, 3);
iter.skipStartedAt = -1;
return Any.wrap((Object) null);
if (nextToken(iter) == 'u' &&
nextToken(iter) == 'l' &&
nextToken(iter) == 'l') {

iter.skipStartedAt = -1;
return Any.wrap((Object) null);
} else {
throw iter.reportError("readAny", "expected 'null' but found something else");
}
case '[':
skipArray(iter);
copied = copySkippedBytes(iter);
Expand Down
8 changes: 6 additions & 2 deletions src/main/java/com/jsoniter/IterImplObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,12 @@ public static final String readObject(JsonIterator iter) throws IOException {
byte c = IterImpl.nextToken(iter);
switch (c) {
case 'n':
IterImpl.skipFixedBytes(iter, 3);
return null;
if (IterImpl.readByte(iter) == 'u' &&
IterImpl.readByte(iter) == 'l' &&
IterImpl.readByte(iter) == 'l') {
return null;
}
throw iter.reportError("readObject", "expected 'null' but found something else");
case '{':
c = IterImpl.nextToken(iter);
if (c == '"') {
Expand Down
9 changes: 7 additions & 2 deletions src/main/java/com/jsoniter/IterImplSkip.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,13 @@ public static final void skip(JsonIterator iter) throws IOException {
return;
case 't':
case 'n':
IterImpl.skipFixedBytes(iter, 3); // true or null
return;
if (IterImpl.readByte(iter) == 'u' &&
IterImpl.readByte(iter) == 'l' &&
IterImpl.readByte(iter) == 'l') {
return;
} else {
throw iter.reportError("skip", "expected 'null' but found something else");
}
case 'f':
IterImpl.skipFixedBytes(iter, 4); // false
return;
Expand Down