Skip to content

uri: Simplify memory-management in php_uri_parse() #19928

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

Merged
TimWolla merged 1 commit into from
Oct 14, 2025
Merged

uri: Simplify memory-management in php_uri_parse() #19928

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
11 changes: 6 additions & 5 deletions ext/uri/php_uri.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,16 @@ 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)
{
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);
void *uri = uri_parser->parse(uri_str, uri_str_len, NULL, NULL, silent);

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

php_uri_internal *internal_uri = emalloc(sizeof(*internal_uri));
internal_uri->parser = uri_parser;
internal_uri->uri = uri;

return internal_uri;
}

Expand Down