1 files changed, 13 insertions, 3 deletions

diff --git a/src/lib/libc/stdlib/strtoimax.c b/src/lib/libc/stdlib/strtoimax.c
index 2c77f41650..2fc04e4850 100644
--- a/src/lib/libc/stdlib/strtoimax.c
+++ b/src/lib/libc/stdlib/strtoimax.c
@@ -1,6 +1,5 @@
-/*      $OpenBSD: strtoimax.c,v 1.1 2006/01/13 17:58:09 millert Exp $   */
-
-/*-
+/*      $OpenBSD: strtoimax.c,v 1.2 2014/09/13 20:10:12 schwarze Exp $  */
+/*
  * Copyright (c) 1992 The Regents of the University of California.
  * All rights reserved.
  *
@@ -48,6 +47,17 @@ strtoimax(const char *nptr, char **endptr, int base)
         int neg, any, cutlim;
 
         /*
+         * Ensure that base is between 2 and 36 inclusive, or the special
+         * value of 0.
+         */
+        if (base < 0 || base == 1 || base > 36) {
+                if (endptr != 0)
+                        *endptr = (char *)nptr;
+                errno = EINVAL;
+                return 0;
+        }
+
+        /*
          * Skip white space and pick up leading +/- sign if any.
          * If base is 0, allow 0x for hex and 0 for octal, else
          * assume decimal; if base is already 16, allow 0x.