Skip to content

fix: throw JsonSyntaxException for null elements in AtomicIntegerArray #3126

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

Closed
priyadarshnisundararajan wants to merge 1 commit into from
Closed

fix: throw JsonSyntaxException for null elements in AtomicIntegerArray #3126

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
4 changes: 4 additions & 0 deletions gson/src/main/java/com/google/gson/internal/bind/TypeAdapters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,10 @@ public AtomicIntegerArray read(JsonReader in) throws IOException {
in.beginArray();
while (in.hasNext()) {
try {
if (in.peek() == JsonToken.NULL) {
throw new JsonSyntaxException(
"null is not a valid AtomicIntegerArray element; at path " + in.getPath());
}
int integer = in.nextInt();
list.add(integer);
} catch (NumberFormatException e) {
Expand Down
10 changes: 10 additions & 0 deletions gson/src/test/java/com/google/gson/functional/JavaUtilConcurrentAtomicTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,14 @@ public void testAtomicLongArrayWithNullElement() {
.hasMessageThat()
.isEqualTo("null is not a valid AtomicLongArray element; at path $[1]");
}

@Test
public void testAtomicIntegerArrayWithNullElement() {
JsonSyntaxException e =
assertThrows(
JsonSyntaxException.class, () -> gson.fromJson("[1,null,3]", AtomicIntegerArray.class));
assertThat(e)
.hasMessageThat()
.isEqualTo("null is not a valid AtomicIntegerArray element; at path $[1]");
}
}
Loading