]> granicus.if.org Git - php/commitdiff
Fix undefined behaviour in strnatcmp
authorAndrea Faulds <ajf@ajf.me>
Sat, 13 Dec 2014 22:06:27 +0000 (22:06 +0000)
committerAndrea Faulds <ajf@ajf.me>
Sat, 13 Dec 2014 22:06:27 +0000 (22:06 +0000)
ext/standard/strnatcmp.c

index de6f7273430609d89d8e294bd29aecb1fab3ebe7..0decda3df965aba0c1a469185f5d5c872ec0d46c 100644 (file)
@@ -118,11 +118,11 @@ PHPAPI int strnatcmp_ex(char const *a, size_t a_len, char const *b, size_t b_len
                ca = *ap; cb = *bp;
 
                /* skip over leading zeros */
-               while (leading && ca == '0' && (ap+1 < aend) && isdigit(*(ap+1))) {
+               while (leading && ca == '0' && (ap+1 < aend) && isdigit((int)(unsigned char)*(ap+1))) {
                        ca = *++ap;
                }
 
-               while (leading && cb == '0' && (bp+1 < bend) && isdigit(*(bp+1))) {
+               while (leading && cb == '0' && (bp+1 < bend) && isdigit((int)(unsigned char)*(bp+1))) {
                        cb = *++bp;
                }