X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2F_PDCLIB%2Fstrtox_prelim.c;h=7be40309ed41931c09fc0302f94a2959e4a2c09f;hb=219271fd548949abce8bd75c34dd42e519418fc4;hp=6cd5a10e3520cdd059517d430de47460077b3792;hpb=b08f4b52b1cd1f7a9553c0f357a7c90859fa3e73;p=pdclib

diff --git a/functions/_PDCLIB/strtox_prelim.c b/functions/_PDCLIB/strtox_prelim.c
index 6cd5a10..7be4030 100644
--- a/functions/_PDCLIB/strtox_prelim.c
+++ b/functions/_PDCLIB/strtox_prelim.c
@@ -7,7 +7,9 @@
 */
 
 #include <ctype.h>
-
+#include <stddef.h>
+#include <string.h>
+#ifndef REGTEST
 const char * _PDCLIB_strtox_prelim( const char * p, char * sign, int * base )
 {
     /* skipping leading whitespace */
@@ -23,6 +25,15 @@ const char * _PDCLIB_strtox_prelim( const char * p, char * sign, int * base )
         {
             *base = 16;
             ++p;
+            /* catching a border case here: "0x" followed by a non-digit should
+               be parsed as the unprefixed zero.
+               We have to "rewind" the parsing; having the base set to 16 if it
+               was zero previously does not hurt, as the result is zero anyway.
+            */
+            if ( memchr( _PDCLIB_digits, tolower(*p), *base ) == NULL )
+            {
+                p -= 2;
+            }
         }
         else if ( *base == 0 )
         {
@@ -39,12 +50,14 @@ const char * _PDCLIB_strtox_prelim( const char * p, char * sign, int * base )
     }
     return ( ( *base >= 2 ) && ( *base <= 36 ) ) ? p : NULL;
 }
+#endif
 
 #ifdef TEST
 #include <_PDCLIB_test.h>
 
 int main( void )
 {
+#ifndef REGTEST
     int base = 0;
     char sign = '\0';
     char test1[] = "  123";
@@ -72,6 +85,7 @@ int main( void )
     TESTCASE( _PDCLIB_strtox_prelim( test3, &sign, &base ) == NULL );
     base = 37;
     TESTCASE( _PDCLIB_strtox_prelim( test3, &sign, &base ) == NULL );
+#endif
     return TEST_RESULTS;
 }