1 files changed, 3 insertions, 3 deletions

diff --git a/src/lib/libc/stdlib/strtoll.c b/src/lib/libc/stdlib/strtoll.c
index 0ba51da77e..d21a249a0b 100644
--- a/src/lib/libc/stdlib/strtoll.c
+++ b/src/lib/libc/stdlib/strtoll.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strtoll.c,v 1.9 2015/09/13 08:31:48 guenther Exp $ */
+/*      $OpenBSD: strtoll.c,v 1.10 2017/07/06 16:23:11 millert Exp $ */
 /*
  * Copyright (c) 1992 The Regents of the University of California.
  * All rights reserved.
@@ -77,8 +77,8 @@ strtoll(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;