strtoull: Fix behaviour on chars between '9' and 'a'.
Reported by: Aaron Miller <aaronmiller@fb.com>
This commit is contained in:
parent
61f4f2d4ef
commit
99ab28563b
2 changed files with 18 additions and 8 deletions
|
@ -391,12 +391,13 @@ grub_strtoull (const char *str, char **end, int base)
|
|||
unsigned long digit;
|
||||
|
||||
digit = grub_tolower (*str) - '0';
|
||||
if (digit > 9)
|
||||
{
|
||||
if (digit >= 'a' - '0')
|
||||
digit += '0' - 'a' + 10;
|
||||
else if (digit > 9)
|
||||
break;
|
||||
|
||||
if (digit >= (unsigned long) base)
|
||||
break;
|
||||
}
|
||||
|
||||
found = 1;
|
||||
|
||||
|
|
|
@ -26,14 +26,23 @@ GRUB_MOD_LICENSE ("GPLv3+");
|
|||
|
||||
static grub_err_t
|
||||
grub_functional_test (grub_extcmd_context_t ctxt __attribute__ ((unused)),
|
||||
int argc __attribute__ ((unused)),
|
||||
char **args __attribute__ ((unused)))
|
||||
int argc,
|
||||
char **args)
|
||||
{
|
||||
grub_test_t test;
|
||||
int ok = 1;
|
||||
int i;
|
||||
|
||||
FOR_LIST_ELEMENTS (test, grub_test_list)
|
||||
{
|
||||
if (argc != 0)
|
||||
{
|
||||
for (i = 0; i < argc; i++)
|
||||
if (grub_strcmp(args[i], test->name) == 0)
|
||||
break;
|
||||
if (i == argc)
|
||||
continue;
|
||||
}
|
||||
grub_errno = 0;
|
||||
ok = ok && !grub_test_run (test);
|
||||
grub_errno = 0;
|
||||
|
|
Loading…
Reference in a new issue