From 6d7f2a4d2a78cdbf06e7bdfb127b18f97a75b3f3 Mon Sep 17 00:00:00 2001 From: Wilmer Paulino Date: Sat, 3 Aug 2024 11:53:07 -0700 Subject: [PATCH] Catch missing InvalidValue errors for parseCLI --- src/config/Config.zig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/config/Config.zig b/src/config/Config.zig index c6c5e8c94..555fa30b2 100644 --- a/src/config/Config.zig +++ b/src/config/Config.zig @@ -2962,9 +2962,9 @@ pub const Color = packed struct(u24) { var result: Color = undefined; comptime var i: usize = 0; inline while (i < 6) : (i += 2) { - const v: u8 = - ((try std.fmt.charToDigit(trimmed[i], 16)) * 16) + - try std.fmt.charToDigit(trimmed[i + 1], 16); + const hi = std.fmt.charToDigit(trimmed[i], 16) catch return error.InvalidValue; + const lo = std.fmt.charToDigit(trimmed[i + 1], 16) catch return error.InvalidValue; + const v: u8 = hi * 16 + lo; @field(result, switch (i) { 0 => "r", @@ -3017,7 +3017,7 @@ pub const Palette = struct { const eqlIdx = std.mem.indexOf(u8, value, "=") orelse return error.InvalidValue; - const key = try std.fmt.parseInt(u8, value[0..eqlIdx], 10); + const key = std.fmt.parseInt(u8, value[0..eqlIdx], 10) catch return error.InvalidValue; const rgb = try Color.parseCLI(value[eqlIdx + 1 ..]); self.value[key] = .{ .r = rgb.r, .g = rgb.g, .b = rgb.b }; } @@ -3061,7 +3061,7 @@ pub const Palette = struct { const testing = std.testing; var p: Self = .{}; - try testing.expectError(error.Overflow, p.parseCLI("256=#AABBCC")); + try testing.expectError(error.InvalidValue, p.parseCLI("256=#AABBCC")); } test "formatConfig" {