mark consumed afterwards instead of before

Author: adinauer

sentry/src/main/java/io/sentry/JsonObjectReader.java

@@ -56,8 +56,9 @@ public JsonObjectReader(Reader in) {
 
   @Override
   public float nextFloat() throws IOException {
+    final double value = jsonReader.nextDouble();
     markValueConsumed();
-    return (float) jsonReader.nextDouble();
+    return (float) value;
   }
 
   @Override
@@ -302,38 +303,43 @@ public boolean hasNext() throws IOException {
 
   @Override
   public int nextInt() throws IOException {
+    final int value = jsonReader.nextInt();
     markValueConsumed();
-    return jsonReader.nextInt();
+    return value;
   }
 
   @Override
   public long nextLong() throws IOException {
+    final long value = jsonReader.nextLong();
     markValueConsumed();
-    return jsonReader.nextLong();
+    return value;
   }
 
   @Override
   public String nextString() throws IOException {
+    final String value = jsonReader.nextString();
     markValueConsumed();
-    return jsonReader.nextString();
+    return value;
   }
 
   @Override
   public boolean nextBoolean() throws IOException {
+    final boolean value = jsonReader.nextBoolean();
     markValueConsumed();
-    return jsonReader.nextBoolean();
+    return value;
   }
 
   @Override
   public double nextDouble() throws IOException {
+    final double value = jsonReader.nextDouble();
     markValueConsumed();
-    return jsonReader.nextDouble();
+    return value;
   }
 
   @Override
   public void nextNull() throws IOException {
-    markValueConsumed();
     jsonReader.nextNull();
+    markValueConsumed();
   }
 
   @Override

sentry/src/test/java/io/sentry/JsonObjectReaderTest.kt

@@ -51,6 +51,19 @@ class JsonObjectReaderTest {
       nextName()
     }
 
+  private fun <T> assertNextMapOrNullRecoversAfterFailedPrimitiveRead(
+    badValue: String,
+    goodValue: String,
+    expectedValue: T,
+    deserializer: JsonDeserializer<T>,
+  ) {
+    val actual =
+      getValuesReader("{\"bad\": $badValue, \"good\": $goodValue}")
+        .nextMapOrNull(fixture.logger, deserializer)
+
+    assertEquals(mapOf("good" to expectedValue), actual)
+  }
+
   // nextStringOrNull
 
   @Test
@@ -313,6 +326,52 @@ class JsonObjectReaderTest {
     assertEquals(emptyMap(), actual)
   }
 
+  @Test(timeout = 1000L)
+  fun `nextMapOrNull recovers after failed primitive reads`() {
+    assertNextMapOrNullRecoversAfterFailedPrimitiveRead(
+      badValue = "true",
+      goodValue = "2",
+      expectedValue = 2,
+      deserializer = JsonDeserializer { reader, _ -> reader.nextInt() },
+    )
+    assertNextMapOrNullRecoversAfterFailedPrimitiveRead(
+      badValue = "true",
+      goodValue = "2",
+      expectedValue = 2L,
+      deserializer = JsonDeserializer { reader, _ -> reader.nextLong() },
+    )
+    assertNextMapOrNullRecoversAfterFailedPrimitiveRead(
+      badValue = "true",
+      goodValue = "\"two\"",
+      expectedValue = "two",
+      deserializer = JsonDeserializer { reader, _ -> reader.nextString() },
+    )
+    assertNextMapOrNullRecoversAfterFailedPrimitiveRead(
+      badValue = "1",
+      goodValue = "false",
+      expectedValue = false,
+      deserializer = JsonDeserializer { reader, _ -> reader.nextBoolean() },
+    )
+    assertNextMapOrNullRecoversAfterFailedPrimitiveRead(
+      badValue = "true",
+      goodValue = "2.5",
+      expectedValue = 2.5,
+      deserializer = JsonDeserializer { reader, _ -> reader.nextDouble() },
+    )
+    assertNextMapOrNullRecoversAfterFailedPrimitiveRead(
+      badValue = "true",
+      goodValue = "null",
+      expectedValue = Unit,
+      deserializer = JsonDeserializer { reader, _ -> reader.nextNull() },
+    )
+    assertNextMapOrNullRecoversAfterFailedPrimitiveRead(
+      badValue = "true",
+      goodValue = "2.5",
+      expectedValue = 2.5f,
+      deserializer = JsonDeserializer { reader, _ -> reader.nextFloat() },
+    )
+  }
+
   @Test(timeout = 1000L)
   fun `nextMapOrNull keeps values before a failing value`() {
     val actual =