Skip to content

Fix: peekNumber rejects some numerals like 2^64 + "0" #2114

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

Merged
JakeWharton merged 1 commit into from
Jun 11, 2026
+14 −1
Merged

Fix: peekNumber rejects some numerals like 2^64 + "0" #2114

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
2 changes: 1 addition & 1 deletion moshi/src/main/java/com/squareup/moshi/-JsonUtf8Reader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ internal class `-JsonUtf8Reader` : JsonReader {
}

NUMBER_CHAR_DIGIT -> {
if (value == 0L) {
if (fitsInLong && value == 0L) {
return PEEKED_NONE // Leading '0' prefix is not allowed (since it could be octal).
}
val newValue = value * 10 - (c - '0').toLong()
Expand Down
13 changes: 13 additions & 0 deletions moshi/src/test/java/com/squareup/moshi/JsonUtf8ReaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,19 @@ public void negativeZeroIsANumber() throws Exception {
assertEquals("-0", reader.nextString());
}

/**
* Regression test for a bug where {@code peekNumber} rejected a valid numeric literal whose
* prefix happened to be a multiple of 2<sup>64</sup>. The {@code long} accumulator wraps to
* exactly zero in that case, which the old "leading zero" guard misread as an octal prefix.
*/
@Test
public void numberLongAccumulatorOverflowsToZero() throws IOException {
String number = "184467440737095516160";
JsonReader reader = newReader(number);
assertThat(reader.peek()).isEqualTo(NUMBER);
assertThat(reader.nextString()).isEqualTo(number);
}

@Test
public void numberToStringCoersion() throws Exception {
JsonReader reader = newReader("[0, 9223372036854775807, 2.5, 3.010, \"a\", \"5\"]");
Expand Down