MFH(r-1.71): Possible fix for bug #26391 (parse_url() destroys strings

that contain a character in range of 0x80-0xff)
# I couldn't reproduce it with Panther though.

diff --git a/ext/standard/url.c b/ext/standard/url.c
index 24967ce127ad4e2ae4729aa5859ff8f9b3e1690b..d66bd546d17c0b0e51b997a51393cf060895decd 100644 (file)
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -104,7 +104,7 @@ PHPAPI php_url *php_url_parse(char *str)
                         * correctly parse things like a.com:80
                         */
                        p = e + 1;
-                       while (isdigit(*p)) {
+                       while (isdigit((int)*(unsigned char *)p)) {
                                p++;
                        }
                        
@@ -145,7 +145,7 @@ PHPAPI php_url *php_url_parse(char *str)
                p = e + 1;
                pp = p;
                
-               while (pp-p < 6 && isdigit(*pp)) {
+               while (pp-p < 6 && isdigit((int)*(unsigned char *)pp)) {
                        pp++;
                }
                
@@ -330,12 +330,12 @@ static int php_htoi(char *s)
        int value;
        int c;
 
-       c = s[0];
+       c = ((unsigned char *)s)[0];
        if (isupper(c))
                c = tolower(c);
        value = (c >= '0' && c <= '9' ? c - '0' : c - 'a' + 10) * 16;
 
-       c = s[1];
+       c = ((unsigned char *)s)[1];
        if (isupper(c))
                c = tolower(c);
        value += c >= '0' && c <= '9' ? c - '0' : c - 'a' + 10;
@@ -443,7 +443,7 @@ PHPAPI int php_url_decode(char *str, int len)
        while (len--) {
                if (*data == '+')
                        *dest = ' ';
-               else if (*data == '%' && len >= 2 && isxdigit((int) *(data + 1)) && isxdigit((int) *(data + 2))) {
+               else if (*data == '%' && len >= 2 && isxdigit((int) *(unsigned char *)(data + 1)) && isxdigit((int) *(unsigned char *)(data + 2))) {
 #ifndef CHARSET_EBCDIC
                        *dest = (char) php_htoi(data + 1);
 #else