Skip to content

[Fix] UTF-8 handling on macOS in php_replace_controlchars() #19529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Fix] UTF-8 handling on macOS in php_replace_controlchars() #19529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ext/standard/tests/url/url_utf8.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--TEST--
Uri: hostnames should be preserved in Unicode form
--FILE--
<?php

$parsed = parse_url('http://ουτοπία.δπθ.gr/');
var_dump($parsed['host']);
?>
--EXPECT--
string(24) "ουτοπία.δπθ.gr"
24 changes: 24 additions & 0 deletions ext/standard/url.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@
#include <string.h>
#include <ctype.h>
#include <sys/types.h>
#if defined(__APPLE__)
#include <wchar.h>
#endif
#if defined(__APPLE__)
#include <wctype.h>
#endif

#include "php.h"

Expand Down Expand Up @@ -58,6 +64,24 @@ static void parse_url_free_uri(void *uri)

static void php_replace_controlchars(char *str, size_t len)
{
#if defined(__APPLE__)
{
ZEND_ASSERT(str != NULL);
wchar_t wbuf[len];
memset(wbuf, 0, sizeof(wbuf));
size_t wlen = mbstowcs(wbuf, str, len);

for (size_t i = 0; i < wlen; i++) {
if (iswcntrl(wbuf[i])) {
wbuf[i] = L'_';
}
}

wcstombs(str, wbuf, len);
return;
}
#endif

unsigned char *s = (unsigned char *)str;
unsigned char *e = (unsigned char *)str + len;

Expand Down