commit 0883e542993c97352dface3d4770e4fe597115d7
author EdwarDDay <4127904+EdwarDDay@users.noreply.github.com> Fri Mar 12 13:49:03 2021 +0100
committer GitHub <noreply@github.com> Fri Mar 12 15:49:03 2021 +0300
tree 4d3ed8583aaacd0f4ab8f4416954e9929da9a16d
parent 3219c712de9e8e4895a98a5ce3323e4477769a87

Fix numeric overflow in JsonLexer (#1367)

formats/json/commonMain/src/kotlinx/serialization/json/internal/JsonLexer.kt

diff --git a/formats/json/commonMain/src/kotlinx/serialization/json/internal/JsonLexer.kt b/formats/json/commonMain/src/kotlinx/serialization/json/internal/JsonLexer.kt
index a1a92e8..3b6bd39 100644
--- a/formats/json/commonMain/src/kotlinx/serialization/json/internal/JsonLexer.kt
+++ b/formats/json/commonMain/src/kotlinx/serialization/json/internal/JsonLexer.kt
@@ -521,7 +521,11 @@
             ++current
         }
         currentPosition = current
-        return if (isNegative) accumulator else -accumulator
+        return when {
+            isNegative -> accumulator
+            accumulator != Long.MIN_VALUE -> -accumulator
+            else -> fail("Numeric value overflow")
+        }
     }
 
 

formats/json/commonTest/src/kotlinx/serialization/json/JsonParserFailureModesTest.kt

diff --git a/formats/json/commonTest/src/kotlinx/serialization/json/JsonParserFailureModesTest.kt b/formats/json/commonTest/src/kotlinx/serialization/json/JsonParserFailureModesTest.kt
index 06e78b8..a36b90a 100644
--- a/formats/json/commonTest/src/kotlinx/serialization/json/JsonParserFailureModesTest.kt
+++ b/formats/json/commonTest/src/kotlinx/serialization/json/JsonParserFailureModesTest.kt
@@ -62,6 +62,14 @@
                     it
                 )
             }
+            // -9223372036854775808 is Long.MIN_VALUE
+            assertFailsWith<JsonDecodingException> {
+                default.decodeFromString(
+                    Holder.serializer(),
+                    """{"id":9223372036854775808}""",
+                    it
+                )
+            }
             assertFailsWith<JsonDecodingException> { default.decodeFromString(Holder.serializer(), """{"id"}""", it) }
             assertFailsWith<JsonDecodingException> { default.decodeFromString(Holder.serializer(), """{"id}""", it) }
             assertFailsWith<JsonDecodingException> { default.decodeFromString(Holder.serializer(), """{"i}""", it) }