X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdlib%2Fstrtoll.c;h=b9b6627b6ed322cdacc689b4c4f3d43afbf20e22;hb=d02f38605b53cdff5460cc6b9e1b2a80c3a2ba4c;hp=21ef1f48783aceaf6de74923a6f968931a1afa41;hpb=ec01598cc2925e0bb00a50dd60ccd5ab5d3cbe57;p=pdclib

diff --git a/functions/stdlib/strtoll.c b/functions/stdlib/strtoll.c
index 21ef1f4..b9b6627 100644
--- a/functions/stdlib/strtoll.c
+++ b/functions/stdlib/strtoll.c
@@ -8,26 +8,27 @@
    Permission is granted to use, modify, and / or redistribute at will.
 */
 
-#define _PDCLIB_INT_H _PDCLIB_INT_H
-#include <_PDCLIB_int.h>
 #include <limits.h>
 #include <stdlib.h>
 
 #ifndef REGTEST
 
+#include <stdint.h>
+
 long long int strtoll( const char * s, char ** endptr, int base )
 {
     long long int rc;
     char sign = '+';
     const char * p = _PDCLIB_strtox_prelim( s, &sign, &base );
+    if ( base < 2 || base > 36 ) return 0;
     if ( sign == '+' )
     {
-        rc = _PDCLIB_strtox_main( &p, base, LLONG_MAX, LLONG_MAX / base, LLONG_MAX % base, &sign );
+        rc = _PDCLIB_strtox_main( &p, (unsigned)base, (uintmax_t)LLONG_MAX, (uintmax_t)( LLONG_MAX / base ), (uintmax_t)( LLONG_MAX % base ), &sign );
     }
     else
     {
         /* FIXME: This breaks on some machines that round negatives wrongly */
-        rc = _PDCLIB_strtox_main( &p, base, LLONG_MIN, LLONG_MIN / -base, -( LLONG_MIN % base ), &sign );
+        rc = _PDCLIB_strtox_main( &p, (unsigned)base, (uintmax_t)LLONG_MIN, (uintmax_t)( LLONG_MIN / -base ), (uintmax_t)( -( LLONG_MIN % base ) ), &sign );
     }
     if ( endptr != NULL ) *endptr = ( p != NULL ) ? (char *) p : (char *) s;
     return ( sign == '+' ) ? rc : -rc;
@@ -37,14 +38,19 @@ long long int strtoll( const char * s, char ** endptr, int base )
 
 #ifdef TEST
 #include <_PDCLIB_test.h>
+
+#ifndef _PDCLIB_INT_H
+#define _PDCLIB_INT_H
+#include <_PDCLIB_int.h>
+#endif
+
 #include <errno.h>
 
-int main()
+int main( void )
 {
     char * endptr;
     /* this, to base 36, overflows even a 256 bit integer */
     char overflow[] = "-ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ_";
-    BEGIN_TESTS;
     errno = 0;
     /* basic functionality */
     TESTCASE( strtoll( "123", NULL, 10 ) == 123 );