php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
We can try parsing before allocating the `uri_internal_t` struct.
This commit is contained in:
Tim Düsterhus
2025-10-14 08:36:51 +02:00
committed by GitHub
parent ff86c593a2
commit 84c7c03363
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ext/uri/php_uri.c
View File

@@ -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;
}