Skip to content

uri: Improve exceptions for Uri\Rfc3986\Uri #19161

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
merged 6 commits into from
Jul 18, 2025
Merged

uri: Improve exceptions for Uri\Rfc3986\Uri #19161

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c38309b
uri: Streamline implementation of `uriparser_parse_uri_ex()`
TimWolla Jul 5, 2025
7e2ba9d
uri: Improve exceptions for `Uri\Rfc3986\Uri`
TimWolla Jul 5, 2025
8bbca6c
uri: Allow empty URIs for RFC3986
TimWolla Jul 18, 2025
52c6fca
Merge branch 'master' into uri-uriparser-parse-simplify
TimWolla Jul 18, 2025
bf7fee2
NEWS
TimWolla Jul 18, 2025
48f1824
uri: Improve ext/uri/tests/004.phpt for empty URIs
TimWolla Jul 18, 2025
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
32 changes: 22 additions & 10 deletions ext/uri/php_uriparser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include "Zend/zend_exceptions.h"

static void uriparser_free_uri(void *uri);
static void throw_invalid_uri_exception(void);

static void *uriparser_malloc(UriMemoryManager *memory_manager, size_t size)
{
Expand Down Expand Up @@ -293,21 +292,25 @@ static uriparser_uris_t *uriparser_create_uris(void)
return uriparser_uris;
}

static void throw_invalid_uri_exception(void)
{
zend_throw_exception(uri_invalid_uri_exception_ce, "The specified URI is malformed", 0);
}
void *uriparser_parse_uri_ex(const zend_string *uri_str, const uriparser_uris_t *uriparser_base_urls, bool silent)
{
UriUriA uri = {0};

/* Empty URIs are always invalid. */
if (ZSTR_LEN(uri_str) == 0) {
if (!silent) {
zend_throw_exception(uri_invalid_uri_exception_ce, "The specified URI must not be empty", 0);
}

goto fail;
}

/* Parse the URI. */
if (uriParseSingleUriExMmA(&uri, ZSTR_VAL(uri_str), ZSTR_VAL(uri_str) + ZSTR_LEN(uri_str), NULL, mm) != URI_SUCCESS) {
if (!silent) {
zend_throw_exception(uri_invalid_uri_exception_ce, "The specified URI is malformed", 0);
}

goto fail;
}

Expand All @@ -316,7 +319,20 @@ void *uriparser_parse_uri_ex(const zend_string *uri_str, const uriparser_uris_t

/* Combine the parsed URI with the base URI and store the result in 'tmp',
* since the target and source URLs must be distinct. */
if (uriAddBaseUriExMmA(&tmp, &uri, &uriparser_base_urls->uri, URI_RESOLVE_STRICTLY, mm) != URI_SUCCESS) {
int result = uriAddBaseUriExMmA(&tmp, &uri, &uriparser_base_urls->uri, URI_RESOLVE_STRICTLY, mm);
if (result != URI_SUCCESS) {
if (!silent) {
switch (result) {
case URI_ERROR_ADDBASE_REL_BASE:
zend_throw_exception(uri_invalid_uri_exception_ce, "The specified base URI must be absolute", 0);
break;
default:
/* This should be unreachable in practice. */
zend_throw_exception(uri_invalid_uri_exception_ce, "Failed to resolve the specified URI against the base URI", 0);
break;
}
}

goto fail;
}

Expand All @@ -337,10 +353,6 @@ void *uriparser_parse_uri_ex(const zend_string *uri_str, const uriparser_uris_t

uriFreeUriMembersMmA(&uri, mm);

if (!silent) {
throw_invalid_uri_exception();
}

return NULL;
}

Expand Down
2 changes: 1 addition & 1 deletion ext/uri/tests/004.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ var_dump(Uri\WhatWg\Url::parse("http://RuPaul's Drag Race All Stars 7 Winners Ca

?>
--EXPECTF--
The specified URI is malformed
The specified URI must not be empty
NULL
The specified URI is malformed (MissingSchemeNonRelativeUrl)
NULL
Expand Down
2 changes: 1 addition & 1 deletion ext/uri/tests/055.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ try {
}
?>
--EXPECT--
The specified URI is malformed
The specified base URI must be absolute