Skip to content

Fix GH-17139: Fix zip_entry_name() crash on invalid entry. #17142

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

Closed
wants to merge 1 commit into from
Closed

Fix GH-17139: Fix zip_entry_name() crash on invalid entry. #17142

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
1 change: 1 addition & 0 deletions ext/zip/php_zip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1257,6 +1257,7 @@ PHP_FUNCTION(zip_read)

zr_rsrc->zf = zip_fopen_index(rsrc_int->za, rsrc_int->index_current, 0);
if (zr_rsrc->zf) {
Z_ADDREF_P(zip_dp);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might lead to a memory leak. Wouldn't the refcount increase for every zip_read()?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ASAN nor DEBUG build reported anything on this new test nor in zip_read.phpt

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Argh – resources! For a clean solution, the le_zip_entry resources would need to store a reference to their le_zip_dir resource; otherwise, as happens here, if the le_zip_dir resource is closed, there are dangling pointers. Increasing the refcount here (and possibly elsewhere) only shades the problem. Given that the procedural API is deprecated as of PHP 8.0.0, I'd opt for wontfix. @remicollet, what do you think?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If that s obsolete for that long, might be best remove it for 8.5/9.0 or so many people still using this api ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the plan is to remove for PHP 9 (removing in a minor is quite a BC break). And I guess most are using the OO-API already.

rsrc_int->index_current++;
RETURN_RES(zend_register_resource(zr_rsrc, le_zip_entry));
} else {
Expand Down
19 changes: 19 additions & 0 deletions ext/zip/tests/gh17139.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
--TEST--
GH-17139 - zip_entry_name() crash
--EXTENSIONS--
zip
--FILE--
<?php
$zip = zip_open(__DIR__."/test_procedural.zip");
if (!is_resource($zip)) die("Failure");
// no need to bother looping over, the entry name should point to a dangling address from the first iteration
$zip = zip_read($zip);
var_dump(zip_entry_name($zip));
?>
--EXPECTF--
Deprecated: Function zip_open() is deprecated in %s on line %d

Deprecated: Function zip_read() is deprecated in %s on line %d

Deprecated: Function zip_entry_name() is deprecated in %s on line %d
string(3) "foo"
Loading