Commit e2f3074

committed

uri: Simplify memory-management in php_uri_parse()

We can try parsing before allocating the `uri_internal_t` struct.

1 parent e6c6333 commit e2f3074Copy full SHA for e2f3074

File tree

-5

lines changed

-5

lines changed

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -112,15 +112,16 @@ PHPAPI const php_uri_parser php_uri_get_parser(zend_string uri_parser_name)`
`112`	`112`
`113`	`113`	`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)`
`114`	`114`	`{`
`115`		`- uri_internal_t internal_uri = emalloc(sizeof(internal_uri));`
`116`		`- internal_uri->parser = uri_parser;`
`117`		`- internal_uri->uri = uri_parser->parse(uri_str, uri_str_len, NULL, NULL, silent);`
	`115`	`+ void *parsed = uri_parser->parse(uri_str, uri_str_len, NULL, NULL, silent);`
`118`	`116`
`119`		`- if (UNEXPECTED(internal_uri->uri == NULL)) {`
`120`		`- efree(internal_uri);`
	`117`	`+ if (parsed == NULL) {`
`121`	`118`	`return NULL;`
`122`	`119`	`}`
`123`	`120`
	`121`	`+ uri_internal_t internal_uri = emalloc(sizeof(internal_uri));`
	`122`	`+ internal_uri->parser = uri_parser;`
	`123`	`+ internal_uri->uri = parsed;`
	`124`	`+`
`124`	`125`	`return internal_uri;`
`125`	`126`	`}`
`126`	`127`

Comments

(0)