Johannes/gson-comments
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't leave the JsonReader in an invalid state if nextInt(), nextDouble() or nextLong() fails. We now save a reference to the string before we parse it, and keep that referenced value if parsing fails.

Browse Source
This commit is contained in:
Jesse Wilson 2012-08-26 22:06:57 +00:00
parent e7bfd0c97d
commit 085856c128
2 changed files with 49 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
gson/src/main/java/com/google/gson/stream/JsonReader.java
View File

@ -202,13 +202,14 @@ public class JsonReader implements Closeable {
private static final int PEEKED_SINGLE_QUOTED = 8;
private static final int PEEKED_DOUBLE_QUOTED = 9;
private static final int PEEKED_UNQUOTED = 10;
private static final int PEEKED_SINGLE_QUOTED_NAME = 11;
private static final int PEEKED_DOUBLE_QUOTED_NAME = 12;
private static final int PEEKED_UNQUOTED_NAME = 13;
private static final int PEEKED_BUFFERED = 11;
private static final int PEEKED_SINGLE_QUOTED_NAME = 12;
private static final int PEEKED_DOUBLE_QUOTED_NAME = 13;
private static final int PEEKED_UNQUOTED_NAME = 14;
/** When this is returned, the integer value is stored in peekedInteger. */
private static final int PEEKED_INTEGER = 14;
private static final int PEEKED_NUMBER = 15;
private static final int PEEKED_EOF = 16;
private static final int PEEKED_INTEGER = 15;
private static final int PEEKED_NUMBER = 16;
private static final int PEEKED_EOF = 17;
/** The input JSON. */
private final Reader in;
@ -245,6 +246,8 @@ public class JsonReader implements Closeable {
*/
private int peekedNumberLength;
private String peekedString;
/*
* The nesting stack. Using a manual array rather than an ArrayList saves 20%.
*/
@ -417,6 +420,7 @@ public class JsonReader implements Closeable {
case PEEKED_SINGLE_QUOTED:
case PEEKED_DOUBLE_QUOTED:
case PEEKED_UNQUOTED:
case PEEKED_BUFFERED:
return JsonToken.STRING;
case PEEKED_INTEGER:
case PEEKED_NUMBER:
@ -550,7 +554,7 @@ public class JsonReader implements Closeable {
}
if (stackSize == 1) {
checkLenient();
checkLenient(); // Top-level value isn't an array or an object.
}
int result = peekKeyword();
@ -765,6 +769,9 @@ public class JsonReader implements Closeable {
result = nextQuotedValue('\'');
} else if (p == PEEKED_DOUBLE_QUOTED) {
result = nextQuotedValue('"');
} else if (p == PEEKED_BUFFERED) {
result = peekedString;
peekedString = null;
} else if (p == PEEKED_INTEGER) {
result = Long.toString(peekedInteger);
} else if (p == PEEKED_NUMBER) {
@ -841,24 +848,25 @@ public class JsonReader implements Closeable {
return (double) peekedInteger;
}
String asString;
if (p == PEEKED_NUMBER) {
asString = new String(buffer, pos, peekedNumberLength);
peekedString = new String(buffer, pos, peekedNumberLength);
pos += peekedNumberLength;
} else if (p == PEEKED_SINGLE_QUOTED || p == PEEKED_DOUBLE_QUOTED) {
asString = nextQuotedValue(p == PEEKED_SINGLE_QUOTED ? '\'' : '"');
peekedString = nextQuotedValue(p == PEEKED_SINGLE_QUOTED ? '\'' : '"');
} else if (p == PEEKED_UNQUOTED) {
asString = nextUnquotedValue();
} else {
peekedString = nextUnquotedValue();
} else if (p != PEEKED_BUFFERED) {
throw new IllegalStateException("Expected a double but was " + peek()
+ " at line " + getLineNumber() + " column " + getColumnNumber());
}
double result = Double.parseDouble(asString); // don't catch this NumberFormatException.
peeked = PEEKED_BUFFERED;
double result = Double.parseDouble(peekedString); // don't catch this NumberFormatException.
if (!lenient && (Double.isNaN(result) || Double.isInfinite(result))) {
throw new MalformedJsonException("JSON forbids NaN and infinities: " + result
+ " at line " + getLineNumber() + " column " + getColumnNumber());
}
peekedString = null;
peeked = PEEKED_NONE;
return result;
}
@ -884,14 +892,13 @@ public class JsonReader implements Closeable {
return peekedInteger;
}
String asString;
if (p == PEEKED_NUMBER) {
asString = new String(buffer, pos, peekedNumberLength);
peekedString = new String(buffer, pos, peekedNumberLength);
pos += peekedNumberLength;
} else if (p == PEEKED_SINGLE_QUOTED || p == PEEKED_DOUBLE_QUOTED) {
asString = nextQuotedValue(p == PEEKED_SINGLE_QUOTED ? '\'' : '"');
peekedString = nextQuotedValue(p == PEEKED_SINGLE_QUOTED ? '\'' : '"');
try {
long result = Long.parseLong(asString);
long result = Long.parseLong(peekedString);
peeked = PEEKED_NONE;
return result;
} catch (NumberFormatException ignored) {
@ -902,12 +909,14 @@ public class JsonReader implements Closeable {
+ " at line " + getLineNumber() + " column " + getColumnNumber());
}
double asDouble = Double.parseDouble(asString); // don't catch this NumberFormatException.
peeked = PEEKED_BUFFERED;
double asDouble = Double.parseDouble(peekedString); // don't catch this NumberFormatException.
long result = (long) asDouble;
if (result != asDouble) { // Make sure no precision was lost casting to 'long'.
throw new NumberFormatException("Expected a long but was " + asString
throw new NumberFormatException("Expected a long but was " + peekedString
+ " at line " + getLineNumber() + " column " + getColumnNumber());
}
peekedString = null;
peeked = PEEKED_NONE;
return result;
}
@ -1063,14 +1072,13 @@ public class JsonReader implements Closeable {
return result;
}
String asString;
if (p == PEEKED_NUMBER) {
asString = new String(buffer, pos, peekedNumberLength);
peekedString = new String(buffer, pos, peekedNumberLength);
pos += peekedNumberLength;
} else if (p == PEEKED_SINGLE_QUOTED || p == PEEKED_DOUBLE_QUOTED) {
asString = nextQuotedValue(p == PEEKED_SINGLE_QUOTED ? '\'' : '"');
peekedString = nextQuotedValue(p == PEEKED_SINGLE_QUOTED ? '\'' : '"');
try {
result = Integer.parseInt(asString);
result = Integer.parseInt(peekedString);
peeked = PEEKED_NONE;
return result;
} catch (NumberFormatException ignored) {
@ -1081,12 +1089,14 @@ public class JsonReader implements Closeable {
+ " at line " + getLineNumber() + " column " + getColumnNumber());
}
double asDouble = Double.parseDouble(asString); // don't catch this NumberFormatException.
peeked = PEEKED_BUFFERED;
double asDouble = Double.parseDouble(peekedString); // don't catch this NumberFormatException.
result = (int) asDouble;
if (result != asDouble) { // Make sure no precision was lost casting to 'int'.
throw new NumberFormatException("Expected an int but was " + asString
throw new NumberFormatException("Expected an int but was " + peekedString
+ " at line " + getLineNumber() + " column " + getColumnNumber());
}
peekedString = null;
peeked = PEEKED_NONE;
return result;
}

28
gson/src/test/java/com/google/gson/stream/JsonReaderTest.java
View File

@ -349,18 +349,6 @@ public final class JsonReaderTest extends TestCase {
assertEquals(JsonToken.END_DOCUMENT, reader.peek());
}
/**
* This test fails because there's no double for 9223372036854775806, and
* our long parsing uses Double.parseDouble() for fractional values.
*/
public void disabled_testHighPrecisionLong() throws IOException {
String json = "[9223372036854775806.000]";
JsonReader reader = new JsonReader(new StringReader(json));
reader.beginArray();
assertEquals(9223372036854775806L, reader.nextLong());
reader.endArray();
}
public void testNumberWithOctalPrefix() throws IOException {
String json = "[01]";
JsonReader reader = new JsonReader(new StringReader(json));
@ -438,7 +426,7 @@ public final class JsonReaderTest extends TestCase {
* This test fails because there's no double for -9223372036854775809, and our
* long parsing uses Double.parseDouble() for fractional values.
*/
public void testPeekLargerThanLongMinValue() throws IOException {
public void disabled_testPeekLargerThanLongMinValue() throws IOException {
JsonReader reader = new JsonReader(new StringReader("[-9223372036854775809]"));
reader.setLenient(true);
reader.beginArray();
@ -451,6 +439,18 @@ public final class JsonReaderTest extends TestCase {
assertEquals(-9223372036854775809d, reader.nextDouble());
}
/**
* This test fails because there's no double for 9223372036854775806, and
* our long parsing uses Double.parseDouble() for fractional values.
*/
public void disabled_testHighPrecisionLong() throws IOException {
String json = "[9223372036854775806.000]";
JsonReader reader = new JsonReader(new StringReader(json));
reader.beginArray();
assertEquals(9223372036854775806L, reader.nextLong());
reader.endArray();
}
public void testPeekMuchLargerThanLongMinValue() throws IOException {
JsonReader reader = new JsonReader(new StringReader("[-92233720368547758080]"));
reader.setLenient(true);
@ -1063,7 +1063,7 @@ public final class JsonReaderTest extends TestCase {
public void testStrictTopLevelString() {
JsonReader reader = new JsonReader(new StringReader("\"a\""));
try {
reader.nextBoolean();
reader.nextString();
fail();
} catch (IOException expected) {
}