summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Beaver <cellog@php.net>2009-05-05 01:41:51 +0000
committerGreg Beaver <cellog@php.net>2009-05-05 01:41:51 +0000
commit6f101e7c0658373e46f78771221fbfa89aa2ac38 (patch)
treee5591558f3cee4d9092bb4b63be2fd156aa03dee
parent09034cf3f495f980b035922717ab7dcbd6bcc62c (diff)
downloadphp-git-6f101e7c0658373e46f78771221fbfa89aa2ac38.tar.gz
remove precautionary #ifdef - the problem was fixed by moving the efree inside the zend_try block
-rwxr-xr-xext/phar/phar_object.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index f163f99b7b..3cc681752b 100755
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -310,11 +310,9 @@ static int phar_file_action(phar_archive_data *phar, phar_entry_info *info, char
efree(new_op_array);
-#if PHP_VERSION_ID < 50300
if (EG(return_value_ptr_ptr) && *EG(return_value_ptr_ptr)) {
zval_ptr_dtor(EG(return_value_ptr_ptr));
}
-#endif
} zend_catch {
if (PHAR_G(cwd)) {
efree(PHAR_G(cwd));