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.

2 files changed, 7 insertions, 7 deletions

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 };
 		}
diff --git a/src/config.c b/src/config.c
index 2b85028..556199d 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1027,7 +1027,7 @@ uint32_t parse_uint32(const char *filename, size_t lineno, const char *str, bool
 {
 	errno = 0;
 	char *endptr;
-	int64_t ret = strtoul(str, &endptr, 0);
+	int64_t ret = strtoull(str, &endptr, 0);
 	if (endptr == str || *endptr != '\0') {
 		PARSE_ERROR(filename, lineno, "Failed to parse \"%s\" as unsigned int.\n", str);
 		if (err) {
@@ -1046,7 +1046,7 @@ int32_t parse_int32(const char *filename, size_t lineno, const char *str, bool *
 {
 	errno = 0;
 	char *endptr;
-	int64_t ret = strtol(str, &endptr, 0);
+	int64_t ret = strtoll(str, &endptr, 0);
 	if (endptr == str || *endptr != '\0') {
 		PARSE_ERROR(filename, lineno, "Failed to parse \"%s\" as int.\n", str);
 		if (err) {
@@ -1065,7 +1065,7 @@ struct uint32_percent parse_uint32_percent(const char *filename, size_t lineno,
 {
 	errno = 0;
 	char *endptr;
-	int64_t val = strtoul(str, &endptr, 0);
+	int64_t val = strtoull(str, &endptr, 0);
 	bool percent = false;
 	if (endptr == str || (*endptr != '\0' && *endptr != '%')) {
 		PARSE_ERROR(filename, lineno, "Failed to parse \"%s\" as unsigned int.\n", str);