Skip to content

Use dtor instead of free_obj for ZipArchive #19602

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 2 commits into
base: master
Choose a base branch
from
Open

Use dtor instead of free_obj for ZipArchive #19602

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9895509
Use dtor instead of free_obj for ZipArchive
iluuu1994 Aug 27, 2025
8ecada2
Change approach
iluuu1994 Aug 28, 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
7 changes: 4 additions & 3 deletions ext/zip/php_zip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1004,8 +1004,10 @@ static void php_zip_cancel_callback_free(void *ptr)
}
#endif

static void php_zip_object_free_storage(zend_object *object) /* {{{ */
static void php_zip_object_dtor(zend_object *object) /* {{{ */
{
zend_objects_destroy_object(object);

ze_zip_object * intern = php_zip_fetch_object(object);
int i;

Expand Down Expand Up @@ -1034,7 +1036,6 @@ static void php_zip_object_free_storage(zend_object *object) /* {{{ */
#endif

intern->za = NULL;
zend_object_std_dtor(&intern->zo);

if (intern->filename) {
efree(intern->filename);
Expand Down Expand Up @@ -3119,7 +3120,7 @@ static PHP_MINIT_FUNCTION(zip)
{
memcpy(&zip_object_handlers, &std_object_handlers, sizeof(zend_object_handlers));
zip_object_handlers.offset = XtOffsetOf(ze_zip_object, zo);
zip_object_handlers.free_obj = php_zip_object_free_storage;
zip_object_handlers.dtor_obj = php_zip_object_dtor;
zip_object_handlers.clone_obj = NULL;
zip_object_handlers.get_property_ptr_ptr = php_zip_get_property_ptr_ptr;

Expand Down
28 changes: 28 additions & 0 deletions ext/zip/tests/ZipArchive_bailout.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
--TEST--
ZipArchive destructor should be called on bailout
--EXTENSIONS--
zip
--FILE--
<?php

function &cb() {}

$file = __DIR__ . '/gh18907.zip';
$zip = new ZipArchive;
$zip->open($file, ZIPARCHIVE::CREATE);
$zip->registerCancelCallback(cb(...));
$zip->addFromString('test', 'test');
$fusion = $zip;

?>
--CLEAN--
<?php
$file = __DIR__ . '/gh18907.zip';
@unlink($file);
?>
--EXPECTF--
Notice: Only variable references should be returned by reference in %s on line %d

Notice: Only variable references should be returned by reference in %s on line %d

Notice: Only variable references should be returned by reference in %s on line %d