From dc6e1b5af83eb1c4290baf97c2d221c0865127be Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Wed, 10 Aug 2016 17:49:42 +0200 Subject: [PATCH] strtoull: Fix behaviour on chars between '9' and 'a'. Reported by: Aaron Miller --- grub-core/kern/misc.c | 13 +++++++------ grub-core/tests/lib/functional_test.c | 13 +++++++++++-- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c index d1a54df6c12..3b633d51f4c 100644 --- a/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c @@ -391,12 +391,13 @@ grub_strtoull (const char *str, char **end, int base) unsigned long digit; digit = grub_tolower (*str) - '0'; - if (digit > 9) - { - digit += '0' - 'a' + 10; - if (digit >= (unsigned long) base) - break; - } + if (digit >= 'a' - '0') + digit += '0' - 'a' + 10; + else if (digit > 9) + break; + + if (digit >= (unsigned long) base) + break; found = 1; diff --git a/grub-core/tests/lib/functional_test.c b/grub-core/tests/lib/functional_test.c index d4822a12456..96781fb39b5 100644 --- a/grub-core/tests/lib/functional_test.c +++ b/grub-core/tests/lib/functional_test.c @@ -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;