From 667075f0920da3c2b353fbce54b6430c195ef031 Mon Sep 17 00:00:00 2001 From: Phil Jones Date: Sun, 30 Apr 2023 20:08:57 +0100 Subject: Replace `strto[u]l` with `strto[u]ll`. On 32-bit systems, using `strtoul` was causing negative values for unsigned options to be treated as valid, as the value was being parsed as a 32-bit unsigned int, then cast to a 64-bit signed int, which remained positive. --- src/color.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/color.c') diff --git a/src/color.c b/src/color.c index 4b6b356..b1d5e90 100644 --- a/src/color.c +++ b/src/color.c @@ -22,7 +22,7 @@ struct color hex_to_color(const char *hex) hex[2], hex[2], '\0'}; char *endptr; - tmp = strtol(str, &endptr, 16); + tmp = strtoll(str, &endptr, 16); if (errno || *endptr != '\0' || tmp < 0) { return (struct color) { -1, -1, -1, -1 }; } @@ -37,14 +37,14 @@ struct color hex_to_color(const char *hex) hex[3], hex[3], '\0'}; char *endptr; - tmp = strtol(str, &endptr, 16); + tmp = strtoll(str, &endptr, 16); if (errno || *endptr != '\0' || tmp < 0) { return (struct color) { -1, -1, -1, -1 }; } val = tmp; } else if (len == 6) { char *endptr; - tmp = strtol(hex, &endptr, 16); + tmp = strtoll(hex, &endptr, 16); if (errno || *endptr != '\0' || tmp < 0) { return (struct color) { -1, -1, -1, -1 }; } @@ -53,7 +53,7 @@ struct color hex_to_color(const char *hex) val |= 0xFFu; } else if (len == 8) { char *endptr; - tmp = strtol(hex, &endptr, 16); + tmp = strtoll(hex, &endptr, 16); if (errno || *endptr != '\0' || tmp < 0) { return (struct color) { -1, -1, -1, -1 }; } -- cgit v1.2.3