cellog Tue May 5 01:41:52 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar phar_object.c
Log:
remove precautionary #ifdef - the problem was fixed by moving the efree
inside the zend_try block
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.60&r2=1.266.2.61&diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.266.2.60
php-src/ext/phar/phar_object.c:1.266.2.61
--- php-src/ext/phar/phar_object.c:1.266.2.60 Mon May 4 04:29:25 2009
+++ php-src/ext/phar/phar_object.c Tue May 5 01:41:51 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: phar_object.c,v 1.266.2.60 2009/05/04 04:29:25 cellog Exp $ */
+/* $Id: phar_object.c,v 1.266.2.61 2009/05/05 01:41:51 cellog Exp $ */
#include "phar_internal.h"
#include "func_interceptors.h"
@@ -310,11 +310,9 @@
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));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
