Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flashctl: fix error handling of integer arguments 

Previously, flashctl accepted the command 'erase 0x 0x' as valid, even
though the numbers are not valid hex numbers.

Pointed out by lint, which complained about the wrong type conversion
for tolower, isxdigit and isdigit.
This commit is contained in:
rillig 2023-01-08 15:37:56 +00:00
parent 8c46ae662d
commit 8d4a11b7de
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/flashctl/flashctl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: flashctl.c,v 1.4 2011/05/24 13:01:53 joerg Exp $ */
/* $NetBSD: flashctl.c,v 1.5 2023/01/08 15:37:56 rillig Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@ -229,12 +229,12 @@ to_intmax(intmax_t *num, const char *str)
char *endptr;
errno = 0;
if (str[0] == '0' && tolower((int )str[1]) == 'x') {
if (!isxdigit((int )str[0]))
if (str[0] == '0' && (str[1] == 'x' || str[1] == 'X')) {
if (!isxdigit((unsigned char)str[2]))
return EINVAL;
*num = strtoimax(str, &endptr, 16);
} else {
if (!isdigit((int )str[0]))
if (!isdigit((unsigned char)str[0]))
return EINVAL;
*num = strtoimax(str, &endptr, 10);
}