Skip to content

[pull] master from php:master #1020

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 3 commits into from
Sep 7, 2025
Merged

[pull] master from php:master #1020

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f16221
Fix memory leak in phar tar temporary file error handling code
ndossche Sep 6, 2025
3d52e92
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Sep 7, 2025
110fae0
Merge branch 'PHP-8.4'
ndossche Sep 7, 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: 7 additions & 0 deletions ext/phar/tar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1170,6 +1170,7 @@ void phar_tar_flush(phar_archive_data *phar, zend_string *user_stub, bool is_def
}

zend_hash_apply_with_argument(&phar->manifest, phar_tar_writeheaders, (void *) &pass);
/* TODO: memory leak and incorrect continuation if phar_tar_writeheaders fails? */

/* add signature for executable tars or tars explicitly set with setSignatureAlgorithm */
if (!phar->is_data || phar->sig_flags) {
Expand All @@ -1191,6 +1192,12 @@ void phar_tar_flush(phar_archive_data *phar, zend_string *user_stub, bool is_def
entry.fp = php_stream_fopen_tmpfile();
if (entry.fp == NULL) {
spprintf(error, 0, "phar error: unable to create temporary file");

efree(signature);
if (must_close_old_file) {
php_stream_close(oldfile);
}
php_stream_close(newfile);
return;
}
#ifdef WORDS_BIGENDIAN
Expand Down