The 0x (or 0X) prefix in base 16 is optional so only skip over the

prefix if the character following it is a valid hex char.  The C99
standard is clear that given the string "0xy" zero should be returned
and endptr set to point to the "x".  OK deraadt@ espie@

1 files changed, 3 insertions, 3 deletions

diff --git a/src/lib/libc/stdlib/strtoimax.c b/src/lib/libc/stdlib/strtoimax.c
index 52403a7213..74e355626a 100644
--- a/src/lib/libc/stdlib/strtoimax.c
+++ b/src/lib/libc/stdlib/strtoimax.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strtoimax.c,v 1.3 2015/09/12 16:23:14 guenther Exp $  */
+/*      $OpenBSD: strtoimax.c,v 1.4 2017/07/06 16:23:11 millert Exp $   */
 /*
  * Copyright (c) 1992 The Regents of the University of California.
  * All rights reserved.
@@ -74,8 +74,8 @@ strtoimax(const char *nptr, char **endptr, int base)
                 if (c == '+')
                         c = *s++;
         }
-        if ((base == 0 || base == 16) &&
-            c == '0' && (*s == 'x' || *s == 'X')) {
+        if ((base == 0 || base == 16) && c == '0' &&
+            (*s == 'x' || *s == 'X') && isxdigit((unsigned char)s[1])) {
                 c = s[1];
                 s += 2;
                 base = 16;