Skip to content

Throw JsonSyntaxException for null map keys in array form #3056

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

Open
ATKasem wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −0
Open

Throw JsonSyntaxException for null map keys in array form #3056

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
6 changes: 6 additions & 0 deletions gson/src/main/java/com/google/gson/internal/bind/MapTypeAdapterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,9 @@ public Map<K, V> read(JsonReader in) throws IOException {
while (in.hasNext()) {
in.beginArray(); // entry array
K key = keyTypeAdapter.read(in);
if (key == null) {
throw new JsonSyntaxException("Map key is null");
}
V value = valueTypeAdapter.read(in);
if (map.containsKey(key)) {
throw new JsonSyntaxException("duplicate key: " + key);
Expand All @@ -200,6 +203,9 @@ public Map<K, V> read(JsonReader in) throws IOException {
while (in.hasNext()) {
JsonReaderInternalAccess.INSTANCE.promoteNameToValue(in);
K key = keyTypeAdapter.read(in);
if (key == null) {
throw new JsonSyntaxException("Map key is null");
}
V value = valueTypeAdapter.read(in);
if (map.containsKey(key)) {
throw new JsonSyntaxException("duplicate key: " + key);
Expand Down
9 changes: 9 additions & 0 deletions gson/src/test/java/com/google/gson/functional/MapAsArrayTypeAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,15 @@ public void testDuplicateKeyWithNullFirstValueArrayForm() {
assertThat(e).hasMessageThat().isEqualTo("duplicate key: a");
}

@Test
public void testNullKeyArrayForm() {
Gson gson = new Gson();
Type type = new TypeToken<Map<String, Object>>() {}.getType();
JsonSyntaxException e =
assertThrows(JsonSyntaxException.class, () -> gson.fromJson("[[null,1]]", type));
assertThat(e).hasMessageThat().isEqualTo("Map key is null");
}

@Test
public void testMultipleEnableComplexKeyRegistrationHasNoEffect() {
Type type = new TypeToken<Map<Point, String>>() {}.getType();
Expand Down