Commit 1fc877fd94

LemonBoy <thatlemon@gmail.com>
2021-06-30 10:34:14
std: Catch and handle overflow in json parser
When a floating-point value with no fractional part is shoved into an integer type we must check whether it fits or not before calling `@floatToInt` as the builtin panics in case of overflow. Catch the error and bubble it up to the caller.
master
1 parent 628f490
Changed files (1)
lib
std
json.zig
lib/std/json.zig
@@ -1555,6 +1555,7 @@ fn parseInternal(comptime T: type, token: Token, tokens: *TokenStream, options:
                 return try std.fmt.parseInt(T, numberToken.slice(tokens.slice, tokens.i - 1), 10);
             const float = try std.fmt.parseFloat(f128, numberToken.slice(tokens.slice, tokens.i - 1));
             if (std.math.round(float) != float) return error.InvalidNumber;
+            if (float > std.math.maxInt(T) or float < std.math.minInt(T)) return error.Overflow;
             return @floatToInt(T, float);
         },
         .Optional => |optionalInfo| {
@@ -2617,6 +2618,7 @@ test "parse exponential into int" {
     const r = try parse(T, &TokenStream.init("{ \"int\": 4.2e2 }"), ParseOptions{});
     try testing.expectEqual(@as(i64, 420), r.int);
     try testing.expectError(error.InvalidNumber, parse(T, &TokenStream.init("{ \"int\": 0.042e2 }"), ParseOptions{}));
+    try testing.expectError(error.Overflow, parse(T, &TokenStream.init("{ \"int\": 18446744073709551616.0 }"), ParseOptions{}));
 }
 
 test "escaped characters" {