Caught "0xz" corner case, and improved testing.

[pdclib] / functions / _PDCLIB / strtox_prelim.c

diff --git a/functions/_PDCLIB/strtox_prelim.c b/functions/_PDCLIB/strtox_prelim.c
index 69255278ac80eb70eb8ead79fbbcd0c26101da49..29b79197598ace1a5890738a72b20f4052844660 100644 (file)
--- a/functions/_PDCLIB/strtox_prelim.c
+++ b/functions/_PDCLIB/strtox_prelim.c
@@ -1,7 +1,5 @@
 /* $Id$ */
 
-/* Release $Name$ */
-
 /* _PDCLIB_strtox_prelim( const char *, char *, int * )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -9,6 +7,8 @@
 */
 
 #include <ctype.h>
+#include <stddef.h>
+#include <string.h>
 
 const char * _PDCLIB_strtox_prelim( const char * p, char * sign, int * base )
 {
@@ -25,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 )
         {