Commit 8ceef7f8129 for php.net
commit 8ceef7f81299a20208022238219e64aee47d38af
Merge: db2d448da53 132403de396
Author: David Carlier <devnexen@gmail.com>
Date: Fri Sep 18 22:18:04 2026 +0100
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
ext/zip: ZipArchive::close() use-after-free from a progress or cancel callback.
diff --cc ext/zip/php_zip.h
index e761364d0cc,e5930c87aad..38773659012
--- a/ext/zip/php_zip.h
+++ b/ext/zip/php_zip.h
@@@ -73,11 -73,12 +73,12 @@@ typedef struct _php_zip_archive
/* libzip reads buffers until the archive is closed, can outlive the object. */
char **buffers;
int buffers_cnt;
+ bool close;
#ifdef HAVE_PROGRESS_CALLBACK
- zval progress_callback;
+ zend_fcall_info_cache progress_callback;
#endif
#ifdef HAVE_CANCEL_CALLBACK
- zval cancel_callback;
+ zend_fcall_info_cache cancel_callback;
#endif
} php_zip_archive;