mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 14:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

std: remove lossy int to float coercion on json parse

Browse Source
This commit is contained in:
Raiden1411 2025-08-21 10:38:08 +01:00 committed by Alex Rønne Petersen
parent ba726ab65a
commit 55daefdb10
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/std/json/static.zig
View File

@ -567,8 +567,8 @@ pub fn innerParseFromValue(
switch (source) { switch (source) {
.float => |f| { .float => |f| {
if (@round(f) != f) return error.InvalidNumber; if (@round(f) != f) return error.InvalidNumber;
if (f > std.math.maxInt(T)) return error.Overflow; if (f > @as(@TypeOf(f), @floatFromInt(std.math.maxInt(T)))) return error.Overflow;
if (f < std.math.minInt(T)) return error.Overflow; if (f < @as(@TypeOf(f), @floatFromInt(std.math.minInt(T)))) return error.Overflow;
return @as(T, @intFromFloat(f)); return @as(T, @intFromFloat(f));
}, },
.integer => |i| { .integer => |i| {
@ -770,7 +770,7 @@ fn sliceToInt(comptime T: type, slice: []const u8) !T {
// Try to coerce a float to an integer. // Try to coerce a float to an integer.
const float = try std.fmt.parseFloat(f128, slice); const float = try std.fmt.parseFloat(f128, slice);
if (@round(float) != float) return error.InvalidNumber; if (@round(float) != float) return error.InvalidNumber;
if (float > std.math.maxInt(T) or float < std.math.minInt(T)) return error.Overflow; if (float > @as(f128, @floatFromInt(std.math.maxInt(T))) or float < @as(f128, @floatFromInt(std.math.minInt(T)))) return error.Overflow;
return @as(T, @intCast(@as(i128, @intFromFloat(float)))); return @as(T, @intCast(@as(i128, @intFromFloat(float))));
} }