Skip to content

uri: Remove php_uri_parse() and php_uri_free() #19624

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
TimWolla wants to merge 2 commits into
base: master
Choose a base branch
from
+55 −67
Open

uri: Remove php_uri_parse() and php_uri_free() #19624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e3f55c
uri: Simplify memory-management in `php_uri_parse()`
TimWolla Aug 25, 2025
e7eff69
uri: Remove `php_uri_parse()` and `php_uri_free()`
TimWolla Aug 25, 2025
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
13 changes: 9 additions & 4 deletions ext/openssl/xp_ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2640,14 +2640,19 @@ static char *php_openssl_get_url_name(const char *resourcename,
return NULL;
}

php_uri_internal *internal_uri = php_uri_parse(uri_parser, resourcename, resourcenamelen, true);
if (internal_uri == NULL) {
void *parsed = uri_parser->parse(resourcename, resourcenamelen,
/* base_url */ NULL, /* errors */ NULL, /* silent */ true);
if (parsed == NULL) {
return NULL;
}
php_uri_internal internal_uri = {
.parser = uri_parser,
.uri = parsed,
};

char * url_name = NULL;
zval host_zv;
zend_result result = php_uri_get_host(internal_uri, PHP_URI_COMPONENT_READ_MODE_RAW, &host_zv);
zend_result result = php_uri_get_host(&internal_uri, PHP_URI_COMPONENT_READ_MODE_RAW, &host_zv);
if (result == SUCCESS && Z_TYPE(host_zv) == IS_STRING) {
const char * host = Z_STRVAL(host_zv);
size_t len = Z_STRLEN(host_zv);
Expand All @@ -2662,7 +2667,7 @@ static char *php_openssl_get_url_name(const char *resourcename,
}
}

php_uri_free(internal_uri);
uri_parser->destroy(parsed);
zval_ptr_dtor(&host_zv);

return url_name;
Expand Down
56 changes: 21 additions & 35 deletions ext/uri/php_uri.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,20 +109,6 @@ PHPAPI const php_uri_parser *php_uri_get_parser(zend_string *uri_parser_name)
return zend_hash_find_ptr(&uri_parsers, uri_parser_name);
}

ZEND_ATTRIBUTE_NONNULL PHPAPI php_uri_internal *php_uri_parse(const php_uri_parser *uri_parser, const char *uri_str, size_t uri_str_len, bool silent)
{
php_uri_internal *internal_uri = emalloc(sizeof(*internal_uri));
internal_uri->parser = uri_parser;
internal_uri->uri = uri_parser->parse(uri_str, uri_str_len, NULL, NULL, silent);

if (UNEXPECTED(internal_uri->uri == NULL)) {
efree(internal_uri);
return NULL;
}

return internal_uri;
}

ZEND_ATTRIBUTE_NONNULL PHPAPI zend_result php_uri_get_scheme(const php_uri_internal *internal_uri, php_uri_component_read_mode read_mode, zval *zv)
{
return internal_uri->parser->property_handler.scheme.read(internal_uri->uri, read_mode, zv);
Expand Down Expand Up @@ -163,96 +149,95 @@ ZEND_ATTRIBUTE_NONNULL PHPAPI zend_result php_uri_get_fragment(const php_uri_int
return internal_uri->parser->property_handler.fragment.read(internal_uri->uri, read_mode, zv);
}

ZEND_ATTRIBUTE_NONNULL PHPAPI void php_uri_free(php_uri_internal *internal_uri)
{
internal_uri->parser->destroy(internal_uri->uri);
internal_uri->uri = NULL;
internal_uri->parser = NULL;
efree(internal_uri);
}

ZEND_ATTRIBUTE_NONNULL PHPAPI php_uri *php_uri_parse_to_struct(
const php_uri_parser *uri_parser, const char *uri_str, size_t uri_str_len, php_uri_component_read_mode read_mode, bool silent
) {
php_uri_internal *uri_internal = php_uri_parse(uri_parser, uri_str, uri_str_len, silent);
if (uri_internal == NULL) {
void *parsed = uri_parser->parse(uri_str, uri_str_len,
/* base_url */ NULL, /* errors */ NULL, silent);
if (parsed == NULL) {
return NULL;
}

php_uri_internal uri_internal = {
.parser = uri_parser,
.uri = parsed,
};

php_uri *uri = ecalloc(1, sizeof(*uri));
zval tmp;
zend_result result;

result = php_uri_get_scheme(uri_internal, read_mode, &tmp);
result = php_uri_get_scheme(&uri_internal, read_mode, &tmp);
if (result == FAILURE) {
goto error;
}
if (Z_TYPE(tmp) == IS_STRING) {
uri->scheme = Z_STR(tmp);
}

result = php_uri_get_username(uri_internal, read_mode, &tmp);
result = php_uri_get_username(&uri_internal, read_mode, &tmp);
if (result == FAILURE) {
goto error;
}
if (Z_TYPE(tmp) == IS_STRING) {
uri->user = Z_STR(tmp);
}

result = php_uri_get_password(uri_internal, read_mode, &tmp);
result = php_uri_get_password(&uri_internal, read_mode, &tmp);
if (result == FAILURE) {
goto error;
}
if (Z_TYPE(tmp) == IS_STRING) {
uri->password = Z_STR(tmp);
}

result = php_uri_get_host(uri_internal, read_mode, &tmp);
result = php_uri_get_host(&uri_internal, read_mode, &tmp);
if (result == FAILURE) {
goto error;
}
if (Z_TYPE(tmp) == IS_STRING) {
uri->host = Z_STR(tmp);
}

result = php_uri_get_port(uri_internal, read_mode, &tmp);
result = php_uri_get_port(&uri_internal, read_mode, &tmp);
if (result == FAILURE) {
goto error;
}
if (Z_TYPE(tmp) == IS_LONG) {
uri->port = Z_LVAL(tmp);
}

result = php_uri_get_path(uri_internal, read_mode, &tmp);
result = php_uri_get_path(&uri_internal, read_mode, &tmp);
if (result == FAILURE) {
goto error;
}
if (Z_TYPE(tmp) == IS_STRING) {
uri->path = Z_STR(tmp);
}

result = php_uri_get_query(uri_internal, read_mode, &tmp);
result = php_uri_get_query(&uri_internal, read_mode, &tmp);
if (result == FAILURE) {
goto error;
}
if (Z_TYPE(tmp) == IS_STRING) {
uri->query = Z_STR(tmp);
}

result = php_uri_get_fragment(uri_internal, read_mode, &tmp);
result = php_uri_get_fragment(&uri_internal, read_mode, &tmp);
if (result == FAILURE) {
goto error;
}
if (Z_TYPE(tmp) == IS_STRING) {
uri->fragment = Z_STR(tmp);
}

php_uri_free(uri_internal);
uri_parser->destroy(parsed);

return uri;

error:
php_uri_free(uri_internal);

uri_parser->destroy(parsed);
php_uri_struct_free(uri);

return NULL;
Expand Down Expand Up @@ -348,7 +333,8 @@ ZEND_ATTRIBUTE_NONNULL_ARGS(1, 2) PHPAPI void php_uri_instantiate_uri(
base_url = base_url_object->uri;
}

void *uri = uri_parser->parse(ZSTR_VAL(uri_str), ZSTR_LEN(uri_str), base_url, errors_zv != NULL ? &errors : NULL, !should_throw);
void *uri = uri_parser->parse(ZSTR_VAL(uri_str), ZSTR_LEN(uri_str),
base_url, errors_zv != NULL ? &errors : NULL, !should_throw);
if (UNEXPECTED(uri == NULL)) {
if (should_throw) {
zval_ptr_dtor(&errors);
Expand Down
9 changes: 0 additions & 9 deletions ext/uri/php_uri.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ PHPAPI zend_result php_uri_parser_register(const php_uri_parser *uri_parser);
*/
PHPAPI const php_uri_parser *php_uri_get_parser(zend_string *uri_parser_name);

ZEND_ATTRIBUTE_NONNULL PHPAPI php_uri_internal *php_uri_parse(const php_uri_parser *uri_parser, const char *uri_str, size_t uri_str_len, bool silent);

/**
* Retrieves the scheme component based on the read_mode and passes it to the zv ZVAL in case of success.
*
Expand Down Expand Up @@ -173,13 +171,6 @@ ZEND_ATTRIBUTE_NONNULL PHPAPI zend_result php_uri_get_query(const php_uri_intern
*/
ZEND_ATTRIBUTE_NONNULL PHPAPI zend_result php_uri_get_fragment(const php_uri_internal *internal_uri, php_uri_component_read_mode read_mode, zval *zv);

/**
* Frees the uri member within the provided internal URI.
*
* @param internal_uri The internal URI
*/
ZEND_ATTRIBUTE_NONNULL PHPAPI void php_uri_free(php_uri_internal *internal_uri);

/**
* Creates a new php_uri struct containing all the URI components. The components are retrieved based on the read_mode parameter.
*
Expand Down
44 changes: 25 additions & 19 deletions ext/zend_test/test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,8 +741,9 @@ static ZEND_FUNCTION(zend_test_uri_parser)
RETURN_THROWS();
}

php_uri_internal *uri = php_uri_parse(parser, ZSTR_VAL(uri_string), ZSTR_LEN(uri_string), false);
if (uri == NULL) {
void *parsed = parser->parse(ZSTR_VAL(uri_string), ZSTR_LEN(uri_string),
/* base_url */ NULL, /* errors */ NULL, /* silent */ false);
if (parsed == NULL) {
RETURN_THROWS();
}

Expand All @@ -751,45 +752,50 @@ static ZEND_FUNCTION(zend_test_uri_parser)
RETURN_THROWS();
}

php_uri_internal uri = {
.parser = parser,
.uri = parsed,
};

zval value;

array_init(return_value);
zval normalized;
array_init(&normalized);
php_uri_get_scheme(uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
php_uri_get_scheme(&uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
zend_hash_add(Z_ARR(normalized), ZSTR_KNOWN(ZEND_STR_SCHEME), &value);
php_uri_get_username(uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
php_uri_get_username(&uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
zend_hash_add(Z_ARR(normalized), ZSTR_KNOWN(ZEND_STR_USERNAME), &value);
php_uri_get_password(uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
php_uri_get_password(&uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
zend_hash_add(Z_ARR(normalized), ZSTR_KNOWN(ZEND_STR_PASSWORD), &value);
php_uri_get_host(uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
php_uri_get_host(&uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
zend_hash_add(Z_ARR(normalized), ZSTR_KNOWN(ZEND_STR_HOST), &value);
php_uri_get_port(uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
php_uri_get_port(&uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
zend_hash_add(Z_ARR(normalized), ZSTR_KNOWN(ZEND_STR_PORT), &value);
php_uri_get_path(uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
php_uri_get_path(&uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
zend_hash_add(Z_ARR(normalized), ZSTR_KNOWN(ZEND_STR_PATH), &value);
php_uri_get_query(uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
php_uri_get_query(&uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
zend_hash_add(Z_ARR(normalized), ZSTR_KNOWN(ZEND_STR_QUERY), &value);
php_uri_get_fragment(uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
php_uri_get_fragment(&uri, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII, &value);
zend_hash_add(Z_ARR(normalized), ZSTR_KNOWN(ZEND_STR_FRAGMENT), &value);
zend_hash_str_add(Z_ARR_P(return_value), "normalized", strlen("normalized"), &normalized);
zval raw;
array_init(&raw);
php_uri_get_scheme(uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
php_uri_get_scheme(&uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
zend_hash_add(Z_ARR(raw), ZSTR_KNOWN(ZEND_STR_SCHEME), &value);
php_uri_get_username(uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
php_uri_get_username(&uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
zend_hash_add(Z_ARR(raw), ZSTR_KNOWN(ZEND_STR_USERNAME), &value);
php_uri_get_password(uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
php_uri_get_password(&uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
zend_hash_add(Z_ARR(raw), ZSTR_KNOWN(ZEND_STR_PASSWORD), &value);
php_uri_get_host(uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
php_uri_get_host(&uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
zend_hash_add(Z_ARR(raw), ZSTR_KNOWN(ZEND_STR_HOST), &value);
php_uri_get_port(uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
php_uri_get_port(&uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
zend_hash_add(Z_ARR(raw), ZSTR_KNOWN(ZEND_STR_PORT), &value);
php_uri_get_path(uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
php_uri_get_path(&uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
zend_hash_add(Z_ARR(raw), ZSTR_KNOWN(ZEND_STR_PATH), &value);
php_uri_get_query(uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
php_uri_get_query(&uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
zend_hash_add(Z_ARR(raw), ZSTR_KNOWN(ZEND_STR_QUERY), &value);
php_uri_get_fragment(uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
php_uri_get_fragment(&uri, PHP_URI_COMPONENT_READ_MODE_RAW, &value);
zend_hash_add(Z_ARR(raw), ZSTR_KNOWN(ZEND_STR_FRAGMENT), &value);
zend_hash_str_add(Z_ARR_P(return_value), "raw", strlen("raw"), &raw);
zval from_struct;
Expand Down Expand Up @@ -842,7 +848,7 @@ static ZEND_FUNCTION(zend_test_uri_parser)
zend_hash_str_add(Z_ARR_P(return_value), "struct", strlen("struct"), &from_struct);

php_uri_struct_free(uri_struct);
php_uri_free(uri);
parser->destroy(parsed);
}

static bool has_opline(zend_execute_data *execute_data)
Expand Down