Skip to content

Commit a9f7388

Browse files
committed
uri: Simplify memory-management in php_uri_parse()
We can try parsing before allocating the `uri_internal_t` struct.
1 parent 5c6f25b commit a9f7388

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

ext/uri/php_uri.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,16 @@ PHPAPI const php_uri_parser *php_uri_get_parser(zend_string *uri_parser_name)
113113

114114
ZEND_ATTRIBUTE_NONNULL PHPAPI uri_internal_t *php_uri_parse(const php_uri_parser *uri_parser, const char *uri_str, size_t uri_str_len, bool silent)
115115
{
116-
uri_internal_t *internal_uri = emalloc(sizeof(*internal_uri));
117-
internal_uri->parser = uri_parser;
118-
internal_uri->uri = uri_parser->parse(uri_str, uri_str_len, NULL, NULL, silent);
116+
void *parsed = uri_parser->parse(uri_str, uri_str_len, NULL, NULL, silent);
119117

120-
if (UNEXPECTED(internal_uri->uri == NULL)) {
121-
efree(internal_uri);
118+
if (parsed == NULL) {
122119
return NULL;
123120
}
124121

122+
uri_internal_t *internal_uri = emalloc(sizeof(*internal_uri));
123+
internal_uri->parser = uri_parser;
124+
internal_uri->uri = parsed;
125+
125126
return internal_uri;
126127
}
127128

0 commit comments

Comments
 (0)