1 files changed, 19 insertions, 7 deletions

diff --git a/src/lib/libc/stdlib/a64l.c b/src/lib/libc/stdlib/a64l.c
index 975e26ebb2..a68f0a6dcd 100644
--- a/src/lib/libc/stdlib/a64l.c
+++ b/src/lib/libc/stdlib/a64l.c
@@ -4,9 +4,12 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: a64l.c,v 1.2 1996/08/19 08:33:19 tholo Exp $";
+static char *rcsid = "$OpenBSD: a64l.c,v 1.3 1997/08/17 22:58:34 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include <errno.h>
+#include <stdlib.h>
+
 long
 a64l(s)
         const char *s;
@@ -14,21 +17,30 @@ a64l(s)
         long value, digit, shift;
         int i;
 
+        if (s == NULL) {
+                errno = EINVAL;
+                return(-1L);
+        }
+
         value = 0;
         shift = 0;
         for (i = 0; *s && i < 6; i++, s++) {
-                if (*s <= '/')
+                if (*s >= '.' && *s <= '/')
                         digit = *s - '.';
-                else if (*s <= '9')
+                else if (*s >= '0' && *s <= '9')
                         digit = *s - '0' + 2;
-                else if (*s <= 'Z')
+                else if (*s >= 'A' && *s <= 'Z')
                         digit = *s - 'A' + 12;
-                else
-                        digit = *s - 'a' + 38; 
+                else if (*s >= 'a' && *s <= 'z')
+                        digit = *s - 'a' + 38;
+                else {
+                        errno = EINVAL;
+                        return(-1L);
+                }
 
                 value |= digit << shift;
                 shift += 6;
         }
 
-        return (long) value;
+        return(value);
 }