Merge branch 'next' of git.sv.gnu.org:/srv/git/grub into next

This commit is contained in:
Vladimir Serbinenko committed 2017-05-03 11:56:59 +02:00
commit db77aa5ad6
10 files changed
+117 -30

No files matched your search

+7 -6
View File
@@ -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;