Fix URL parsing for Unicode on macOS

Author: arshidkv12

ext/standard/url.c

@@ -47,19 +47,24 @@ PHPAPI void php_url_free(php_url *theurl)
 }
 /* }}} */
 
-static void php_replace_controlchars(char *str, size_t len)
+static void php_str_to_utf8(const char *str, size_t len)
 {
-	unsigned char *s = (unsigned char *)str;
-	unsigned char *e = (unsigned char *)str + len;
-
-	ZEND_ASSERT(str != NULL);
-
-	while (s < e) {
-		if (iscntrl(*s)) {
-			*s='_';
-		}
-		s++;
-	}
+    zend_string *utf8;
+    utf8 = zend_string_alloc(len * 4, 0);
+    const unsigned char *s = (const unsigned char *)str;
+    const unsigned char *e = s + len;
+    unsigned char *d = (unsigned char *)ZSTR_VAL(utf8);
+
+    while (s < e) {
+        if (*s < 0x80) { // ASCII
+            *d++ = *s++;
+        } else {
+            /* Convert non-ASCII bytes to UTF-8 */
+			unsigned int codepoint = *s++;
+            *d++ = 0xEF; *d++ = 0xBF; *d++ = 0xBD;  
+        }
+    }
+	zend_string_release(utf8);
 }
 
 PHPAPI php_url *php_url_parse(char const *str)
@@ -119,7 +124,7 @@ PHPAPI php_url *php_url_parse_ex2(char const *str, size_t length, bool *has_port
 
 		if (e + 1 == ue) { /* only scheme is available */
 			ret->scheme = zend_string_init(s, (e - s), 0);
-			php_replace_controlchars(ZSTR_VAL(ret->scheme), ZSTR_LEN(ret->scheme));
+			php_str_to_utf8(ZSTR_VAL(ret->scheme), ZSTR_LEN(ret->scheme));
 			return ret;
 		}
 
@@ -141,13 +146,13 @@ PHPAPI php_url *php_url_parse_ex2(char const *str, size_t length, bool *has_port
 			}
 
 			ret->scheme = zend_string_init(s, (e-s), 0);
-			php_replace_controlchars(ZSTR_VAL(ret->scheme), ZSTR_LEN(ret->scheme));
+			php_str_to_utf8(ZSTR_VAL(ret->scheme), ZSTR_LEN(ret->scheme));
 
 			s = e + 1;
 			goto just_path;
 		} else {
 			ret->scheme = zend_string_init(s, (e-s), 0);
-			php_replace_controlchars(ZSTR_VAL(ret->scheme), ZSTR_LEN(ret->scheme));
+			php_str_to_utf8(ZSTR_VAL(ret->scheme), ZSTR_LEN(ret->scheme));
 
 			if (e + 2 < ue && *(e + 2) == '/') {
 				s = e + 3;
@@ -213,14 +218,14 @@ PHPAPI php_url *php_url_parse_ex2(char const *str, size_t length, bool *has_port
 	if ((p = zend_memrchr(s, '@', (e-s)))) {
 		if ((pp = memchr(s, ':', (p-s)))) {
 			ret->user = zend_string_init(s, (pp-s), 0);
-			php_replace_controlchars(ZSTR_VAL(ret->user), ZSTR_LEN(ret->user));
+			php_str_to_utf8(ZSTR_VAL(ret->user), ZSTR_LEN(ret->user));
 
 			pp++;
 			ret->pass = zend_string_init(pp, (p-pp), 0);
-			php_replace_controlchars(ZSTR_VAL(ret->pass), ZSTR_LEN(ret->pass));
+			php_str_to_utf8(ZSTR_VAL(ret->pass), ZSTR_LEN(ret->pass));
 		} else {
 			ret->user = zend_string_init(s, (p-s), 0);
-			php_replace_controlchars(ZSTR_VAL(ret->user), ZSTR_LEN(ret->user));
+			php_str_to_utf8(ZSTR_VAL(ret->user), ZSTR_LEN(ret->user));
 		}
 
 		s = p + 1;
@@ -269,7 +274,7 @@ PHPAPI php_url *php_url_parse_ex2(char const *str, size_t length, bool *has_port
 	}
 
 	ret->host = zend_string_init(s, (p-s), 0);
-	php_replace_controlchars(ZSTR_VAL(ret->host), ZSTR_LEN(ret->host));
+	php_str_to_utf8(ZSTR_VAL(ret->host), ZSTR_LEN(ret->host));
 
 	if (e == ue) {
 		return ret;
@@ -285,7 +290,7 @@ PHPAPI php_url *php_url_parse_ex2(char const *str, size_t length, bool *has_port
 		p++;
 		if (p < e) {
 			ret->fragment = zend_string_init(p, (e - p), 0);
-			php_replace_controlchars(ZSTR_VAL(ret->fragment), ZSTR_LEN(ret->fragment));
+			php_str_to_utf8(ZSTR_VAL(ret->fragment), ZSTR_LEN(ret->fragment));
 		} else {
 			ret->fragment = ZSTR_EMPTY_ALLOC();
 		}
@@ -297,7 +302,7 @@ PHPAPI php_url *php_url_parse_ex2(char const *str, size_t length, bool *has_port
 		p++;
 		if (p < e) {
 			ret->query = zend_string_init(p, (e - p), 0);
-			php_replace_controlchars(ZSTR_VAL(ret->query), ZSTR_LEN(ret->query));
+			php_str_to_utf8(ZSTR_VAL(ret->query), ZSTR_LEN(ret->query));
 		} else {
 			ret->query = ZSTR_EMPTY_ALLOC();
 		}
@@ -306,7 +311,7 @@ PHPAPI php_url *php_url_parse_ex2(char const *str, size_t length, bool *has_port
 
 	if (s < e || s == ue) {
 		ret->path = zend_string_init(s, (e - s), 0);
-		php_replace_controlchars(ZSTR_VAL(ret->path), ZSTR_LEN(ret->path));
+		php_str_to_utf8(ZSTR_VAL(ret->path), ZSTR_LEN(ret->path));
 	}
 
 	return ret;