Skip to content

Add tests that shows JsonReader#skipValue() in an infinite loop. #1250

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
garydgregory wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Add tests that shows JsonReader#skipValue() in an infinite loop. #1250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be32f5f
Add tests that shows JsonReader#skipValue() in an infinite loop.
garydgregory Feb 9, 2018
93ef642
Remove use of fully qualified names.
garydgregory Feb 9, 2018
c68b994
fix skipValue() for END_ARRAY and END_OBJECT, fixes #605
Miha-x64 Dec 8, 2019
aee9dac
Merge pull request #1 from Miha-x64/patch-2
garydgregory Jan 18, 2020
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
2 changes: 1 addition & 1 deletion gson/src/main/java/com/google/gson/stream/JsonReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1254,7 +1254,7 @@ public void skipValue() throws IOException {
pos += peekedNumberLength;
}
peeked = PEEKED_NONE;
} while (count != 0);
} while (count > 0);

pathIndices[stackSize - 1]++;
pathNames[stackSize - 1] = "null";
Expand Down
39 changes: 32 additions & 7 deletions gson/src/test/java/com/google/gson/stream/JsonReaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@

package com.google.gson.stream;

import java.io.EOFException;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.util.Arrays;
import junit.framework.TestCase;

import static com.google.gson.stream.JsonToken.BEGIN_ARRAY;
import static com.google.gson.stream.JsonToken.BEGIN_OBJECT;
import static com.google.gson.stream.JsonToken.BOOLEAN;
Expand All @@ -33,6 +26,16 @@
import static com.google.gson.stream.JsonToken.NUMBER;
import static com.google.gson.stream.JsonToken.STRING;

import java.io.EOFException;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.util.Arrays;

import org.junit.Assert;

import junit.framework.TestCase;

@SuppressWarnings("resource")
public final class JsonReaderTest extends TestCase {
public void testReadArray() throws IOException {
Expand Down Expand Up @@ -1591,6 +1594,28 @@ public void testSkipTopLevelUnquotedString() throws IOException {
assertEquals(JsonToken.END_DOCUMENT, reader.peek());
}

public void testSkipValueInfiniteLoopOnObjectEnd() throws IOException {
final String json = "{\"input\":{\"authToken\":\"7f79v2fav7jj48t70vh2jfo84h\",\"packageId\":\"649b1fa1-d323-499a-99b2-fb00da8b1f12\",\"version\":\"1.0.0\"},\"requestId\":\"0a7bd76f-6a3c-417d-b2c8-022e17ea46c0\",\"name\":\"com.seagullsw.appinterface.server.admin.Reconfigure\",\"type\":\"BasicRequest\"}";
final String search = "AMissingValue";
final JsonReader jsonReader = new JsonReader(new StringReader(json));
try {
if (jsonReader.peek() == BEGIN_OBJECT) {
jsonReader.beginObject();
while (jsonReader.peek() == NAME) {
final String jsonName = jsonReader.nextName();
if ("type".equals(jsonName)) {
if (jsonReader.peek() == STRING && search.equals(jsonReader.nextString())) {
Assert.fail();
}
}
jsonReader.skipValue();
}
}
} finally {
jsonReader.close();
}
}

public void testSkipVeryLongQuotedString() throws IOException {
JsonReader reader = new JsonReader(reader("[\"" + repeat('x', 8192) + "\"]"));
reader.beginArray();
Expand Down