php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

phar: Reduce code duplication in destructor (#20140)

Browse Source 
We can make a variant of the macro to control the throwing behaviour.
This commit is contained in:
Niels Dossche
2025-10-11 23:39:32 +02:00
committed by GitHub
parent da906ee4f9
commit f97ee5c71b
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ext/phar/phar_object.c
View File

@@ -4513,28 +4513,27 @@ PHP_METHOD(PharFileInfo, __construct)
}
/* }}} */
#define PHAR_ENTRY_OBJECT() \
#define PHAR_ENTRY_OBJECT_EX(throw) \
zval *zobj = ZEND_THIS; \
phar_entry_object *entry_obj = (phar_entry_object*)((char*)Z_OBJ_P(zobj) - Z_OBJ_P(zobj)->handlers->offset); \
if (!entry_obj->entry) { \
zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, \
"Cannot call method on an uninitialized PharFileInfo object"); \
RETURN_THROWS(); \
if (throw) { \
zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, \
"Cannot call method on an uninitialized PharFileInfo object"); \
} \
return; \
}
#define PHAR_ENTRY_OBJECT() PHAR_ENTRY_OBJECT_EX(true)
/* {{{ clean up directory-based entry objects */
PHP_METHOD(PharFileInfo, __destruct)
{
zval *zobj = ZEND_THIS;
phar_entry_object *entry_obj = (phar_entry_object*)((char*)Z_OBJ_P(zobj) - Z_OBJ_P(zobj)->handlers->offset);
if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
if (!entry_obj->entry) {
return;
}
PHAR_ENTRY_OBJECT_EX(false);
if (entry_obj->entry->is_temp_dir) {
if (entry_obj->entry->filename) {