Skip to content

uri: Call the proper clone_obj handler in uri_write_component_ex() #19649

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 3 commits into
base: master
Choose a base branch
from
+12 −9
Open

uri: Call the proper clone_obj handler in uri_write_component_ex() #19649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4187c7
uri: Call the proper `clone_obj` handler in `uri_write_component_ex()`
TimWolla Aug 30, 2025
7b22549
uri: Call `RETVAL_OBJ(new_object)` early in `uri_write_component_ex()`
TimWolla Aug 30, 2025
ee0a7df
uri: Remove now-useless declaration of `uri_clone_obj_handler` from p…
TimWolla Aug 30, 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
2 changes: 1 addition & 1 deletion ext/uri/php_uri.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -979,7 +979,7 @@ static void uri_free_obj_handler(zend_object *object)
zend_object_std_dtor(&uri_object->std);
}

zend_object *uri_clone_obj_handler(zend_object *object)
static zend_object *uri_clone_obj_handler(zend_object *object)
{
uri_object_t *uri_object = uri_object_from_obj(object);
uri_internal_t *internal_uri = uri_internal_from_obj(object);
Expand Down
18 changes: 11 additions & 7 deletions ext/uri/php_uri_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,34 +83,38 @@ void uri_read_component(INTERNAL_FUNCTION_PARAMETERS, uri_property_name_t proper

static void uri_write_component_ex(INTERNAL_FUNCTION_PARAMETERS, uri_property_name_t property_name, zval *property_zv)
{
zend_object *old_object = Z_OBJ_P(ZEND_THIS);
uri_internal_t *internal_uri = Z_URI_INTERNAL_P(ZEND_THIS);
URI_ASSERT_INITIALIZATION(internal_uri);

zend_object *new_object = old_object->handlers->clone_obj(old_object);
if (new_object == NULL) {
RETURN_THROWS();
}

/* Assign the object early. The engine will take care of destruction in
* case of an exception being thrown. */
RETVAL_OBJ(new_object);

const uri_property_handler_t *property_handler = uri_property_handler_from_internal_uri(internal_uri, property_name);
ZEND_ASSERT(property_handler != NULL);

zend_object *new_object = uri_clone_obj_handler(Z_OBJ_P(ZEND_THIS));
ZEND_ASSERT(new_object != NULL);

uri_internal_t *new_internal_uri = uri_internal_from_obj(new_object);
URI_ASSERT_INITIALIZATION(new_internal_uri);
if (UNEXPECTED(property_handler->write_func == NULL)) {
zend_readonly_property_modification_error_ex(ZSTR_VAL(Z_OBJ_P(ZEND_THIS)->ce->name),
zend_readonly_property_modification_error_ex(ZSTR_VAL(old_object->ce->name),
ZSTR_VAL(get_known_string_by_property_name(property_name)));
zend_object_release(new_object);
RETURN_THROWS();
}

zval errors;
ZVAL_UNDEF(&errors);
if (UNEXPECTED(property_handler->write_func(new_internal_uri, property_zv, &errors) == FAILURE)) {
zval_ptr_dtor(&errors);
zend_object_release(new_object);
RETURN_THROWS();
}

ZEND_ASSERT(Z_ISUNDEF(errors));
RETVAL_OBJ(new_object);
}

void uri_write_component_str(INTERNAL_FUNCTION_PARAMETERS, uri_property_name_t property_name)
Expand Down
1 change: 0 additions & 1 deletion ext/uri/php_uri_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ extern zend_class_entry *uri_invalid_uri_exception_ce;
extern zend_class_entry *uri_whatwg_invalid_url_exception_ce;
extern zend_class_entry *uri_whatwg_url_validation_error_type_ce;
extern zend_class_entry *uri_whatwg_url_validation_error_ce;
extern zend_object *uri_clone_obj_handler(zend_object *object);

typedef enum {
URI_RECOMPOSITION_RAW_ASCII,
Expand Down