cellog          Mon May  4 04:30:50 2009 UTC

  Modified files:              
    /php-src/ext/phar   phar_object.c 
  Log:
  MFB: disable mysterious segfault on PHP 5.3 (5.2 not affected)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.295&r2=1.296&diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.295 
php-src/ext/phar/phar_object.c:1.296
--- php-src/ext/phar/phar_object.c:1.295        Wed Apr 29 03:24:09 2009
+++ php-src/ext/phar/phar_object.c      Mon May  4 04:30:50 2009
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: phar_object.c,v 1.295 2009/04/29 03:24:09 cellog Exp $ */
+/* $Id: phar_object.c,v 1.296 2009/05/04 04:30:50 cellog Exp $ */
 
 #include "phar_internal.h"
 #include "func_interceptors.h"
@@ -310,9 +310,11 @@
                                        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

Reply via email to