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

fix(std/fmt.zig): fix overflow in fmtDurationSigned

Browse Source 
fixes #23315
This commit is contained in:
GasInfinity 2025-03-22 00:40:33 +01:00 committed by Linus Groh
parent 149eace5d5
commit dfe0fb675d
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/std/fmt.zig
View File

@ -1380,13 +1380,8 @@ test fmtDuration {
} }
fn formatDurationSigned(ns: i64, comptime fmt: []const u8, options: std.fmt.FormatOptions, writer: anytype) !void { fn formatDurationSigned(ns: i64, comptime fmt: []const u8, options: std.fmt.FormatOptions, writer: anytype) !void {
if (ns < 0) { const data = FormatDurationData{ .ns = @abs(ns), .negative = ns < 0 };
const data = FormatDurationData{ .ns = @as(u64, @intCast(-ns)), .negative = true }; try formatDuration(data, fmt, options, writer);
try formatDuration(data, fmt, options, writer);
} else {
const data = FormatDurationData{ .ns = @as(u64, @intCast(ns)) };
try formatDuration(data, fmt, options, writer);
}
} }
/// Return a Formatter for number of nanoseconds according to its signed magnitude: /// Return a Formatter for number of nanoseconds according to its signed magnitude:
@ -1457,6 +1452,7 @@ test fmtDurationSigned {
.{ .s = "-1y1m999ns", .d = -(365 * std.time.ns_per_day + std.time.ns_per_min + 999) }, .{ .s = "-1y1m999ns", .d = -(365 * std.time.ns_per_day + std.time.ns_per_min + 999) },
.{ .s = "292y24w3d23h47m16.854s", .d = math.maxInt(i64) }, .{ .s = "292y24w3d23h47m16.854s", .d = math.maxInt(i64) },
.{ .s = "-292y24w3d23h47m16.854s", .d = math.minInt(i64) + 1 }, .{ .s = "-292y24w3d23h47m16.854s", .d = math.minInt(i64) + 1 },
.{ .s = "-292y24w3d23h47m16.854s", .d = math.minInt(i64) },
}) |tc| { }) |tc| {
const slice = try bufPrint(&buf, "{}", .{fmtDurationSigned(tc.d)}); const slice = try bufPrint(&buf, "{}", .{fmtDurationSigned(tc.d)});
try std.testing.expectEqualStrings(tc.s, slice); try std.testing.expectEqualStrings(tc.s, slice);