Skip to content

ext/uri: Fix the distinction between an empty and a missing query/fragment for WHATWG URLs #20208

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 1 commit into
base: PHP-8.5
Choose a base branch
from
+45 −4
Open

ext/uri: Fix the distinction between an empty and a missing query/fragment for WHATWG URLs #20208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ PHP NEWS
- URI:
. Fixed bug GH-20088 (Heap-use-after-free in PHP URI WHATWG parser
during malformed URL processing). (lexborisov)
. Fixed the distinction between an empty and a missing query/fragment
when using Uri\WhatWg\Url::getQuery() and Uri\WhatWg\Url::getFragment().
(kocsismate)

09 Oct 2025, PHP 8.5.0RC2

Expand Down
19 changes: 19 additions & 0 deletions ext/uri/tests/whatwg/modification/fragment_success_hashmark.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
--TEST--
Test Uri\WhatWg\Url component modification - fragment - only a hashmark character
--EXTENSIONS--
uri
--FILE--
<?php

$url1 = Uri\WhatWg\Url::parse("https://example.com");
$url2 = $url1->withFragment("#");

var_dump($url1->getFragment());
var_dump($url2->getFragment());
var_dump($url2->toAsciiString());

?>
--EXPECT--
NULL
string(0) ""
string(21) "https://example.com/#"
19 changes: 19 additions & 0 deletions ext/uri/tests/whatwg/modification/query_success_question_mark.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
--TEST--
Test Uri\WhatWg\Url component modification - query - only a question mark character
--EXTENSIONS--
uri
--FILE--
<?php

$url1 = Uri\WhatWg\Url::parse("https://example.com");
$url2 = $url1->withQuery("?");

var_dump($url1->getQuery());
var_dump($url2->getQuery());
var_dump($url2->toAsciiString());

?>
--EXPECT--
NULL
string(0) ""
string(21) "https://example.com/?"
8 changes: 4 additions & 4 deletions ext/uri/uri_parser_whatwg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ static zend_result php_uri_parser_whatwg_username_read(void *uri, php_uri_compon
{
const lxb_url_t *lexbor_uri = uri;

if (lexbor_uri->username.length) {
if (lexbor_uri->username.length > 0) {
ZVAL_STRINGL(retval, (const char *) lexbor_uri->username.data, lexbor_uri->username.length);
} else {
ZVAL_NULL(retval);
Expand Down Expand Up @@ -425,7 +425,7 @@ static zend_result php_uri_parser_whatwg_path_read(void *uri, php_uri_component_
{
const lxb_url_t *lexbor_uri = uri;

if (lexbor_uri->path.str.length) {
if (lexbor_uri->path.str.length > 0) {
ZVAL_STRINGL(retval, (const char *) lexbor_uri->path.str.data, lexbor_uri->path.str.length);
} else {
ZVAL_EMPTY_STRING(retval);
Expand Down Expand Up @@ -454,7 +454,7 @@ static zend_result php_uri_parser_whatwg_query_read(void *uri, php_uri_component
{
const lxb_url_t *lexbor_uri = uri;

if (lexbor_uri->query.length) {
if (lexbor_uri->query.data != NULL) {
ZVAL_STRINGL(retval, (const char *) lexbor_uri->query.data, lexbor_uri->query.length);
} else {
ZVAL_NULL(retval);
Expand Down Expand Up @@ -483,7 +483,7 @@ static zend_result php_uri_parser_whatwg_fragment_read(void *uri, php_uri_compon
{
const lxb_url_t *lexbor_uri = uri;

if (lexbor_uri->fragment.length) {
if (lexbor_uri->fragment.data != NULL) {
ZVAL_STRINGL(retval, (const char *) lexbor_uri->fragment.data, lexbor_uri->fragment.length);
} else {
ZVAL_NULL(retval);
Expand Down