]> granicus.if.org Git - php/commitdiff
MFB: remove precautionary #ifdef - the problem was fixed by moving the efree inside...
authorGreg Beaver <cellog@php.net>
Tue, 5 May 2009 01:42:06 +0000 (01:42 +0000)
committerGreg Beaver <cellog@php.net>
Tue, 5 May 2009 01:42:06 +0000 (01:42 +0000)
ext/phar/phar_object.c

index f163f99b7b594b8198a5fb825a0c588ce6bb888e..3cc681752bbfbe9ee0a21db13b08b90c4ad6a9af 100755 (executable)
@@ -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));