Skip to content

Add the Uri\Rfc3986\Uri class to ext/uri without wither support #18836

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
wants to merge 13 commits into
base: master
Choose a base branch
from
+1,818 −146
Open

Add the Uri\Rfc3986\Uri class to ext/uri without wither support #18836

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
60675b6
Add Uri\Rfc3986\Uri class to ext/uri
kocsismate Jun 11, 2025
ca85779
Review round 1 fixes
kocsismate Jun 11, 2025
db3cdf2
Another batch of fixes
kocsismate Jun 13, 2025
7907ccf
Fix memory management
kocsismate Jun 14, 2025
d430892
Fix Windows build
kocsismate Jun 14, 2025
00d4091
Improve and simplify exceptions
kocsismate Jun 15, 2025
42c6e58
Remove accidentally added extra ;
kocsismate Jun 15, 2025
8bf1722
Try to incorporate uriparser_copy_uri into uriparser
kocsismate Jun 15, 2025
484bbf3
uriparser improvements
kocsismate Jun 18, 2025
34c3f0a
More improvements
kocsismate Jun 22, 2025
1525e64
Allocate on stack
kocsismate Jun 26, 2025
7541b33
Fixes after rebase
kocsismate Jul 1, 2025
471a762
Another fix for uriparser
kocsismate Jul 1, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix memory management 
Co-authored-by: Tim Düsterhus <tim@tideways-gmbh.com>
  • Loading branch information
@kocsismate @TimWolla
kocsismate and TimWolla committed Jul 1, 2025
commit 7907ccfd31869411f8e70bf6a9bb980d80088f2f
45 changes: 10 additions & 35 deletions ext/uri/php_uriparser.c
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something I'm only noticing now: I think this should rather be called ext/uri/parser_rfc3986.c and php_lexbor.c would be ext/uri/parser_whatwg.c. The php_uriparser.c name is confusing to me, because uriparser is an extremely generic term.

To give another comparison with ext/random, since it is architecturally similar: Each engine has its own engine_enginename.c file, e.g. engine_xoshiro256starstar.c.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#include "Zend/zend_smart_str.h"
#include "Zend/zend_exceptions.h"

void *uriparser_parse_uri(const zend_string *uri_str, const void *base_url, zval *errors, bool silent);
static void uriparser_free_uri(void *uri);
static void throw_invalid_uri_exception(void);

Expand Down Expand Up @@ -370,15 +369,13 @@ PHP_MINIT_FUNCTION(uri_uriparser)
}

static uriparser_uris_t *uriparser_create_uris(
UriUriA *uri, zend_string *uri_str,
UriUriA *normalized_uri, zend_string *normalized_uri_str
UriUriA *uri,
UriUriA *normalized_uri
) {
uriparser_uris_t *uriparser_uris = emalloc(sizeof(uriparser_uris_t));

uriparser_uris->uri = uri;
uriparser_uris->uri_str = uri_str;
uriparser_uris->normalized_uri = normalized_uri;
uriparser_uris->normalized_uri_str = normalized_uri_str;

return uriparser_uris;
}
Expand All @@ -392,34 +389,27 @@ void *uriparser_parse_uri_ex(const zend_string *uri_str, const uriparser_uris_t
{
UriUriA *uriparser_uri = emalloc(sizeof(UriUriA));

/* uriparser keeps the originally passed in string, while lexbor may allocate a new one. */
zend_string *original_uri_str = zend_string_init(ZSTR_VAL(uri_str), ZSTR_LEN(uri_str), false);
if (ZSTR_LEN(original_uri_str) == 0 ||
uriParseSingleUriExA(uriparser_uri, ZSTR_VAL(original_uri_str), ZSTR_VAL(original_uri_str) + ZSTR_LEN(original_uri_str), NULL) != URI_SUCCESS
if (ZSTR_LEN(uri_str) == 0 ||
uriParseSingleUriExA(uriparser_uri, ZSTR_VAL(uri_str), ZSTR_VAL(uri_str) + ZSTR_LEN(uri_str), NULL) != URI_SUCCESS
) {
efree(uriparser_uri);
zend_string_release_ex(original_uri_str, false);
if (!silent) {
throw_invalid_uri_exception();
}

return NULL;
}

uriMakeOwnerA(uriparser_uri);
if (uriparser_base_urls == NULL) {
return uriparser_create_uris(uriparser_uri, original_uri_str, NULL, NULL);
return uriparser_create_uris(uriparser_uri, NULL);
}

UriUriA *uriparser_base_url = uriparser_copy_uri(uriparser_base_urls->uri);

UriUriA *absolute_uri = emalloc(sizeof(UriUriA));

if (uriAddBaseUriExA(absolute_uri, uriparser_uri, uriparser_base_url, URI_RESOLVE_STRICTLY) != URI_SUCCESS) {
zend_string_release_ex(original_uri_str, false);
if (uriAddBaseUriExA(absolute_uri, uriparser_uri, uriparser_base_urls->uri, URI_RESOLVE_STRICTLY) != URI_SUCCESS) {
uriFreeUriMembersA(uriparser_uri);
efree(uriparser_uri);
uriFreeUriMembersA(uriparser_base_url);
efree(uriparser_base_url);
efree(absolute_uri);

if (!silent) {
Expand All @@ -429,15 +419,11 @@ void *uriparser_parse_uri_ex(const zend_string *uri_str, const uriparser_uris_t
return NULL;
}

/* TODO fix freeing: if the following code runs, then we'll have use-after-free-s because uriparser doesn't
copy the input. If we don't run the following code, then we'll have memory leaks...
uriFreeUriMembersA(uriparser_base_url);
efree(uriparser_base_url);
uriMakeOwnerA(absolute_uri);
uriFreeUriMembersA(uriparser_uri);
efree(uriparser_uri);
*/

return uriparser_create_uris(absolute_uri, original_uri_str, NULL, NULL);
return uriparser_create_uris(absolute_uri, NULL);
}

void *uriparser_parse_uri(const zend_string *uri_str, const void *base_url, zval *errors, bool silent)
Expand All @@ -451,9 +437,7 @@ static void *uriparser_clone_uri(void *uri)

return uriparser_create_uris(
uriparser_copy_uri(uriparser_uris->uri),
zend_string_copy(uriparser_uris->uri_str),
uriparser_uris->normalized_uri != NULL ? uriparser_copy_uri(uriparser_uris->normalized_uri) : NULL,
uriparser_uris->normalized_uri_str != NULL ? zend_string_copy(uriparser_uris->normalized_uri_str) : NULL
uriparser_uris->normalized_uri != NULL ? uriparser_copy_uri(uriparser_uris->normalized_uri) : NULL
);
}

Expand Down Expand Up @@ -500,22 +484,13 @@ static void uriparser_free_uri(void *uri)
uriparser_uris_t *uriparser_uris = (uriparser_uris_t *) uri;

if (uriparser_uris->uri != NULL) {
if (uriparser_uris->uri_str != NULL) { // TODO can this double free? should we check uriparser_uris->uri->owner?
zend_string_release(uriparser_uris->uri_str);
uriparser_uris->uri_str = NULL;
}

uriFreeUriMembersA(uriparser_uris->uri);
efree(uriparser_uris->uri);
uriparser_uris->uri = NULL;
}

if (uriparser_uris->normalized_uri != NULL) {
ZEND_ASSERT(uriparser_uris->normalized_uri->owner);
if (uriparser_uris->normalized_uri_str != NULL) {
zend_string_release(uriparser_uris->normalized_uri_str);
uriparser_uris->normalized_uri_str = NULL;
}

uriFreeUriMembersA(uriparser_uris->normalized_uri);
efree(uriparser_uris->normalized_uri);
Expand Down
2 changes: 0 additions & 2 deletions ext/uri/php_uriparser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ extern const uri_handler_t uriparser_uri_handler;

typedef struct uriparser_uris_t {
UriUriA *uri;
zend_string *uri_str;
UriUriA *normalized_uri;
zend_string *normalized_uri_str;
} uriparser_uris_t;

PHP_MINIT_FUNCTION(uri_uriparser);
Expand Down