Skip to content

phar: Use object_init_with_constructor where possible #20156

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 2 commits into from
Oct 14, 2025
Merged

phar: Use object_init_with_constructor where possible #20156

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93ef2cc
phar: Use object_init_with_constructor where possible
ndossche Oct 12, 2025
f91ddaf
Drop redundant exception throwing
ndossche Oct 13, 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
51 changes: 14 additions & 37 deletions ext/phar/phar_object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1713,7 +1713,7 @@ PHP_METHOD(Phar, buildFromDirectory)
{
char *error;
bool apply_reg = false;
zval arg, arg2, iter, iteriter, regexiter;
zval iter, iteriter, regexiter;
struct _phar_t pass;
zend_string *dir, *regex = NULL;

Expand All @@ -1729,34 +1729,16 @@ PHP_METHOD(Phar, buildFromDirectory)
RETURN_THROWS();
}

if (SUCCESS != object_init_ex(&iter, spl_ce_RecursiveDirectoryIterator)) {
zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "Unable to instantiate directory iterator for %s", phar_obj->archive->fname);
RETURN_THROWS();
}

ZVAL_STR(&arg, dir);
ZVAL_LONG(&arg2, SPL_FILE_DIR_SKIPDOTS|SPL_FILE_DIR_UNIXPATHS);
zval args[2];
ZVAL_STR(&args[0], dir);
ZVAL_LONG(&args[1], SPL_FILE_DIR_SKIPDOTS|SPL_FILE_DIR_UNIXPATHS);

zend_call_known_instance_method_with_2_params(spl_ce_RecursiveDirectoryIterator->constructor,
Z_OBJ(iter), NULL, &arg, &arg2);

if (EG(exception)) {
zval_ptr_dtor(&iter);
if (SUCCESS != object_init_with_constructor(&iter, spl_ce_RecursiveDirectoryIterator, 2, args, NULL)) {
RETURN_THROWS();
}

if (SUCCESS != object_init_ex(&iteriter, spl_ce_RecursiveIteratorIterator)) {
if (SUCCESS != object_init_with_constructor(&iteriter, spl_ce_RecursiveIteratorIterator, 1, &iter, NULL)) {
zval_ptr_dtor(&iter);
zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "Unable to instantiate directory iterator for %s", phar_obj->archive->fname);
RETURN_THROWS();
}

zend_call_known_instance_method_with_1_params(spl_ce_RecursiveIteratorIterator->constructor,
Z_OBJ(iteriter), NULL, &iter);

if (EG(exception)) {
zval_ptr_dtor(&iter);
zval_ptr_dtor(&iteriter);
RETURN_THROWS();
}

Expand All @@ -1765,15 +1747,13 @@ PHP_METHOD(Phar, buildFromDirectory)
if (regex && ZSTR_LEN(regex) > 0) {
apply_reg = true;

if (SUCCESS != object_init_ex(&regexiter, spl_ce_RegexIterator)) {
ZVAL_COPY_VALUE(&args[0], &iteriter);
ZVAL_STR(&args[1], regex);

if (SUCCESS != object_init_with_constructor(&regexiter, spl_ce_RegexIterator, 2, args, NULL)) {
zval_ptr_dtor(&iteriter);
zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "Unable to instantiate regex iterator for %s", phar_obj->archive->fname);
RETURN_THROWS();
}

ZVAL_STR(&arg2, regex);
zend_call_known_instance_method_with_2_params(spl_ce_RegexIterator->constructor,
Z_OBJ(regexiter), NULL, &iteriter, &arg2);
}

array_init(return_value);
Expand Down Expand Up @@ -2197,15 +2177,12 @@ static zend_object *phar_rename_archive(phar_archive_data **sphar, char *ext) /*
ce = phar_ce_archive;
}

if (SUCCESS != object_init_ex(&ret, ce)) {
zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "Unable to instantiate phar object when converting archive \"%s\"", phar->fname);
ZVAL_STRINGL(&arg1, phar->fname, phar->fname_len);
zend_result result = object_init_with_constructor(&ret, ce, 1, &arg1, NULL);
zval_ptr_dtor_str(&arg1);
if (SUCCESS != result) {
return NULL;
}

ZVAL_STRINGL(&arg1, phar->fname, phar->fname_len);

zend_call_known_instance_method_with_1_params(ce->constructor, Z_OBJ(ret), NULL, &arg1);
zval_ptr_dtor(&arg1);
return Z_OBJ(ret);

err_reused_oldpath:
Expand Down