Skip to content

ext/phar: Avoid redundant manifest hash lookup in offsetUnset() #22437

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
arshidkv12 wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −22
Open

ext/phar: Avoid redundant manifest hash lookup in offsetUnset() #22437

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
43 changes: 21 additions & 22 deletions ext/phar/phar_object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3741,33 +3741,32 @@ PHP_METHOD(Phar, offsetUnset)
RETURN_THROWS();
}

if (zend_hash_exists(&phar_obj->archive->manifest, file_name)) {
phar_entry_info *entry = zend_hash_find_ptr(&phar_obj->archive->manifest, file_name);
if (entry) {
if (entry->is_deleted) {
/* entry is deleted, but has not been flushed to disk yet */
return;
}
phar_entry_info *entry = zend_hash_find_ptr(&phar_obj->archive->manifest, file_name);
if (entry) {
if (entry->is_deleted) {
/* entry is deleted, but has not been flushed to disk yet */
return;
}

if (phar_obj->archive->is_persistent) {
if (FAILURE == phar_copy_on_write(&(phar_obj->archive))) {
zend_throw_exception_ex(phar_ce_PharException, 0, "phar \"%s\" is persistent, unable to copy on write", ZSTR_VAL(phar_obj->archive->fname));
RETURN_THROWS();
}
/* re-populate entry after copy on write */
entry = zend_hash_find_ptr(&phar_obj->archive->manifest, file_name);
if (phar_obj->archive->is_persistent) {
if (FAILURE == phar_copy_on_write(&(phar_obj->archive))) {
zend_throw_exception_ex(phar_ce_PharException, 0, "phar \"%s\" is persistent, unable to copy on write", ZSTR_VAL(phar_obj->archive->fname));
RETURN_THROWS();
}
entry->is_modified = 0;
entry->is_deleted = 1;
/* we need to "flush" the stream to save the newly deleted file on disk */
phar_flush(phar_obj->archive, &error);
/* re-populate entry after copy on write */
entry = zend_hash_find_ptr(&phar_obj->archive->manifest, file_name);
}
entry->is_modified = 0;
entry->is_deleted = 1;
/* we need to "flush" the stream to save the newly deleted file on disk */
phar_flush(phar_obj->archive, &error);

if (error) {
zend_throw_exception_ex(phar_ce_PharException, 0, "%s", error);
efree(error);
}
if (error) {
zend_throw_exception_ex(phar_ce_PharException, 0, "%s", error);
efree(error);
}
}

}
/* }}} */

Expand Down
Loading