From: Greg Beaver <cellog@php.net>
Date: Tue, 5 May 2009 01:41:51 +0000 (+0000)
Subject: remove precautionary #ifdef - the problem was fixed by moving the efree inside the... 
X-Git-Tag: php-5.3.0RC2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f101e7c0658373e46f78771221fbfa89aa2ac38;p=php

remove precautionary #ifdef - the problem was fixed by moving the efree inside the zend_try block
---

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));