From 54fc1aef7a9754a3daa803e47a59d76a8173d703 Mon Sep 17 00:00:00 2001 From: solar Date: Wed, 16 Sep 2009 05:09:36 +0000 Subject: [PATCH] Caught "0xz" corner case, and improved testing. --- functions/_PDCLIB/strtox_prelim.c | 10 ++++++++++ functions/stdlib/strtol.c | 16 ++++++++++++---- functions/stdlib/strtoll.c | 17 +++++++++++++---- functions/stdlib/strtoul.c | 17 +++++++++++++---- functions/stdlib/strtoull.c | 17 +++++++++++++---- 5 files changed, 61 insertions(+), 16 deletions(-) diff --git a/functions/_PDCLIB/strtox_prelim.c b/functions/_PDCLIB/strtox_prelim.c index d36837e..29b7919 100644 --- a/functions/_PDCLIB/strtox_prelim.c +++ b/functions/_PDCLIB/strtox_prelim.c @@ -8,6 +8,7 @@ #include #include +#include const char * _PDCLIB_strtox_prelim( const char * p, char * sign, int * base ) { @@ -24,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 ) { diff --git a/functions/stdlib/strtol.c b/functions/stdlib/strtol.c index 8fc95b0..ea54b98 100644 --- a/functions/stdlib/strtol.c +++ b/functions/stdlib/strtol.c @@ -49,19 +49,27 @@ int main( void ) char * endptr; /* this, to base 36, overflows even a 256 bit integer */ char overflow[] = "-ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ_"; + /* tricky border case */ + char tricky[] = "+0xz"; errno = 0; /* basic functionality */ TESTCASE( strtol( "123", NULL, 10 ) == 123 ); /* proper detecting of default base 10 */ - TESTCASE( strtol( "123", NULL, 0 ) == 123 ); + TESTCASE( strtol( "456", NULL, 0 ) == 456 ); /* proper functioning to smaller base */ TESTCASE( strtol( "14", NULL, 8 ) == 12 ); /* proper autodetecting of octal */ - TESTCASE( strtol( "014", NULL, 0 ) == 12 ); + TESTCASE( strtol( "016", NULL, 0 ) == 14 ); /* proper autodetecting of hexadecimal, lowercase 'x' */ TESTCASE( strtol( "0xFF", NULL, 0 ) == 255 ); /* proper autodetecting of hexadecimal, uppercase 'X' */ - TESTCASE( strtol( "0XFF", NULL, 0 ) == 255 ); + TESTCASE( strtol( "0Xa1", NULL, 0 ) == 161 ); + /* proper handling of border case: 0x followed by non-hexdigit */ + TESTCASE( strtol( tricky, &endptr, 0 ) == 0 ); + TESTCASE( endptr == tricky + 2 ); + /* proper handling of border case: 0 followed by non-octdigit */ + TESTCASE( strtol( tricky, &endptr, 8 ) == 0 ); + TESTCASE( endptr == tricky + 2 ); /* errno should still be 0 */ TESTCASE( errno == 0 ); /* overflowing subject sequence must still return proper endptr */ @@ -74,7 +82,7 @@ int main( void ) TESTCASE( errno == ERANGE ); TESTCASE( ( endptr - overflow ) == 53 ); /* testing skipping of leading whitespace */ - TESTCASE( strtol( " \n\v\t\f123", NULL, 0 ) == 123 ); + TESTCASE( strtol( " \n\v\t\f789", NULL, 0 ) == 789 ); /* testing conversion failure */ TESTCASE( strtol( overflow, &endptr, 10 ) == 0 ); TESTCASE( endptr == overflow ); diff --git a/functions/stdlib/strtoll.c b/functions/stdlib/strtoll.c index aa91163..5b13074 100644 --- a/functions/stdlib/strtoll.c +++ b/functions/stdlib/strtoll.c @@ -50,19 +50,27 @@ int main( void ) char * endptr; /* this, to base 36, overflows even a 256 bit integer */ char overflow[] = "-ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ_"; + /* tricky border case */ + char tricky[] = "+0xz"; errno = 0; /* basic functionality */ TESTCASE( strtoll( "123", NULL, 10 ) == 123 ); /* proper detecting of default base 10 */ - TESTCASE( strtoll( "123", NULL, 0 ) == 123 ); + TESTCASE( strtoll( "456", NULL, 0 ) == 456 ); /* proper functioning to smaller base */ TESTCASE( strtoll( "14", NULL, 8 ) == 12 ); /* proper autodetecting of octal */ - TESTCASE( strtoll( "014", NULL, 0 ) == 12 ); + TESTCASE( strtoll( "016", NULL, 0 ) == 14 ); /* proper autodetecting of hexadecimal, lowercase 'x' */ TESTCASE( strtoll( "0xFF", NULL, 0 ) == 255 ); /* proper autodetecting of hexadecimal, uppercase 'X' */ - TESTCASE( strtoll( "0XFF", NULL, 0 ) == 255 ); + TESTCASE( strtoll( "0Xa1", NULL, 0 ) == 161 ); + /* proper handling of border case: 0x followed by non-hexdigit */ + TESTCASE( strtoll( tricky, &endptr, 0 ) == 0 ); + TESTCASE( endptr == tricky + 2 ); + /* proper handling of border case: 0 followed by non-octdigit */ + TESTCASE( strtoll( tricky, &endptr, 8 ) == 0 ); + TESTCASE( endptr == tricky + 2 ); /* errno should still be 0 */ TESTCASE( errno == 0 ); /* overflowing subject sequence must still return proper endptr */ @@ -75,7 +83,7 @@ int main( void ) TESTCASE( errno == ERANGE ); TESTCASE( ( endptr - overflow ) == 53 ); /* testing skipping of leading whitespace */ - TESTCASE( strtoll( " \n\v\t\f123", NULL, 0 ) == 123 ); + TESTCASE( strtoll( " \n\v\t\f789", NULL, 0 ) == 789 ); /* testing conversion failure */ TESTCASE( strtoll( overflow, &endptr, 10 ) == 0 ); TESTCASE( endptr == overflow ); @@ -119,4 +127,5 @@ int main( void ) #endif return TEST_RESULTS; } + #endif diff --git a/functions/stdlib/strtoul.c b/functions/stdlib/strtoul.c index 7bd8488..4aefc4f 100644 --- a/functions/stdlib/strtoul.c +++ b/functions/stdlib/strtoul.c @@ -35,19 +35,27 @@ int main( void ) char * endptr; /* this, to base 36, overflows even a 256 bit integer */ char overflow[] = "-ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ_"; + /* tricky border case */ + char tricky[] = "+0xz"; errno = 0; /* basic functionality */ TESTCASE( strtoul( "123", NULL, 10 ) == 123 ); /* proper detecting of default base 10 */ - TESTCASE( strtoul( "123", NULL, 0 ) == 123 ); + TESTCASE( strtoul( "456", NULL, 0 ) == 456 ); /* proper functioning to smaller base */ TESTCASE( strtoul( "14", NULL, 8 ) == 12 ); /* proper autodetecting of octal */ - TESTCASE( strtoul( "014", NULL, 0 ) == 12 ); + TESTCASE( strtoul( "016", NULL, 0 ) == 14 ); /* proper autodetecting of hexadecimal, lowercase 'x' */ TESTCASE( strtoul( "0xFF", NULL, 0 ) == 255 ); /* proper autodetecting of hexadecimal, uppercase 'X' */ - TESTCASE( strtoul( "0XFF", NULL, 0 ) == 255 ); + TESTCASE( strtoul( "0Xa1", NULL, 0 ) == 161 ); + /* proper handling of border case: 0x followed by non-hexdigit */ + TESTCASE( strtoul( tricky, &endptr, 0 ) == 0 ); + TESTCASE( endptr == tricky + 2 ); + /* proper handling of border case: 0 followed by non-octdigit */ + TESTCASE( strtoul( tricky, &endptr, 8 ) == 0 ); + TESTCASE( endptr == tricky + 2 ); /* errno should still be 0 */ TESTCASE( errno == 0 ); /* overflowing subject sequence must still return proper endptr */ @@ -60,7 +68,7 @@ int main( void ) TESTCASE( errno == ERANGE ); TESTCASE( ( endptr - overflow ) == 53 ); /* testing skipping of leading whitespace */ - TESTCASE( strtoul( " \n\v\t\f123", NULL, 0 ) == 123 ); + TESTCASE( strtoul( " \n\v\t\f789", NULL, 0 ) == 789 ); /* testing conversion failure */ TESTCASE( strtoul( overflow, &endptr, 10 ) == 0 ); TESTCASE( endptr == overflow ); @@ -69,4 +77,5 @@ int main( void ) TESTCASE( endptr == overflow ); return TEST_RESULTS; } + #endif diff --git a/functions/stdlib/strtoull.c b/functions/stdlib/strtoull.c index b4204e9..a65779c 100644 --- a/functions/stdlib/strtoull.c +++ b/functions/stdlib/strtoull.c @@ -35,19 +35,27 @@ int main( void ) char * endptr; /* this, to base 36, overflows even a 256 bit integer */ char overflow[] = "-ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ_"; + /* tricky border case */ + char tricky[] = "+0xz"; errno = 0; /* basic functionality */ TESTCASE( strtoull( "123", NULL, 10 ) == 123 ); /* proper detecting of default base 10 */ - TESTCASE( strtoull( "123", NULL, 0 ) == 123 ); + TESTCASE( strtoull( "456", NULL, 0 ) == 456 ); /* proper functioning to smaller base */ TESTCASE( strtoull( "14", NULL, 8 ) == 12 ); /* proper autodetecting of octal */ - TESTCASE( strtoull( "014", NULL, 0 ) == 12 ); + TESTCASE( strtoull( "016", NULL, 0 ) == 14 ); /* proper autodetecting of hexadecimal, lowercase 'x' */ TESTCASE( strtoull( "0xFF", NULL, 0 ) == 255 ); /* proper autodetecting of hexadecimal, uppercase 'X' */ - TESTCASE( strtoull( "0XFF", NULL, 0 ) == 255 ); + TESTCASE( strtoull( "0Xa1", NULL, 0 ) == 161 ); + /* proper handling of border case: 0x followed by non-hexdigit */ + TESTCASE( strtoull( tricky, &endptr, 0 ) == 0 ); + TESTCASE( endptr == tricky + 2 ); + /* proper handling of border case: 0 followed by non-octdigit */ + TESTCASE( strtoull( tricky, &endptr, 8 ) == 0 ); + TESTCASE( endptr == tricky + 2 ); /* errno should still be 0 */ TESTCASE( errno == 0 ); /* overflowing subject sequence must still return proper endptr */ @@ -60,7 +68,7 @@ int main( void ) TESTCASE( errno == ERANGE ); TESTCASE( ( endptr - overflow ) == 53 ); /* testing skipping of leading whitespace */ - TESTCASE( strtoull( " \n\v\t\f123", NULL, 0 ) == 123 ); + TESTCASE( strtoull( " \n\v\t\f789", NULL, 0 ) == 789 ); /* testing conversion failure */ TESTCASE( strtoull( overflow, &endptr, 10 ) == 0 ); TESTCASE( endptr == overflow ); @@ -69,4 +77,5 @@ int main( void ) TESTCASE( endptr == overflow ); return TEST_RESULTS; } + #endif -- 2.40.0