pajoye Wed, 03 Feb 2010 18:07:25 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=294427
Log: - Fixed bug #50519 (segfault in garbage collection when using set_error_handler an.. Bug: http://bugs.php.net/50519 (Closed) segfault in garbage collection when using set_error_handler and DomDocument Changed paths: U php/php-src/branches/PHP_5_3_2/Zend/zend_variables.c U php/php-src/branches/PHP_5_3_2/Zend/zend_variables.h Modified: php/php-src/branches/PHP_5_3_2/Zend/zend_variables.c =================================================================== --- php/php-src/branches/PHP_5_3_2/Zend/zend_variables.c 2010-02-03 17:55:57 UTC (rev 294426) +++ php/php-src/branches/PHP_5_3_2/Zend/zend_variables.c 2010-02-03 18:07:25 UTC (rev 294427) @@ -151,13 +151,6 @@ } -#if ZEND_DEBUG -ZEND_API void _zval_copy_ctor_wrapper(zval *zvalue) -{ - zval_copy_ctor(zvalue); -} - - ZEND_API void _zval_dtor_wrapper(zval *zvalue) { TSRMLS_FETCH(); @@ -167,6 +160,13 @@ } +#if ZEND_DEBUG +ZEND_API void _zval_copy_ctor_wrapper(zval *zvalue) +{ + zval_copy_ctor(zvalue); +} + + ZEND_API void _zval_internal_dtor_wrapper(zval *zvalue) { zval_internal_dtor(zvalue); Modified: php/php-src/branches/PHP_5_3_2/Zend/zend_variables.h =================================================================== --- php/php-src/branches/PHP_5_3_2/Zend/zend_variables.h 2010-02-03 17:55:57 UTC (rev 294426) +++ php/php-src/branches/PHP_5_3_2/Zend/zend_variables.h 2010-02-03 18:07:25 UTC (rev 294427) @@ -50,26 +50,25 @@ ZEND_API void _zval_ptr_dtor(zval **zval_ptr ZEND_FILE_LINE_DC); ZEND_API void _zval_internal_dtor(zval *zvalue ZEND_FILE_LINE_DC); ZEND_API void _zval_internal_ptr_dtor(zval **zvalue ZEND_FILE_LINE_DC); +ZEND_API void _zval_dtor_wrapper(zval *zvalue); #define zval_copy_ctor(zvalue) _zval_copy_ctor((zvalue) ZEND_FILE_LINE_CC) #define zval_dtor(zvalue) _zval_dtor((zvalue) ZEND_FILE_LINE_CC) #define zval_ptr_dtor(zval_ptr) _zval_ptr_dtor((zval_ptr) ZEND_FILE_LINE_CC) #define zval_internal_dtor(zvalue) _zval_internal_dtor((zvalue) ZEND_FILE_LINE_CC) #define zval_internal_ptr_dtor(zvalue) _zval_internal_ptr_dtor((zvalue) ZEND_FILE_LINE_CC) +#define zval_dtor_wrapper _zval_dtor_wrapper #if ZEND_DEBUG ZEND_API void _zval_copy_ctor_wrapper(zval *zvalue); -ZEND_API void _zval_dtor_wrapper(zval *zvalue); ZEND_API void _zval_ptr_dtor_wrapper(zval **zval_ptr); ZEND_API void _zval_internal_dtor_wrapper(zval *zvalue); ZEND_API void _zval_internal_ptr_dtor_wrapper(zval **zvalue); #define zval_copy_ctor_wrapper _zval_copy_ctor_wrapper -#define zval_dtor_wrapper _zval_dtor_wrapper #define zval_ptr_dtor_wrapper _zval_ptr_dtor_wrapper #define zval_internal_dtor_wrapper _zval_internal_dtor_wrapper #define zval_internal_ptr_dtor_wrapper _zval_internal_ptr_dtor_wrapper #else #define zval_copy_ctor_wrapper _zval_copy_ctor_func -#define zval_dtor_wrapper _zval_dtor_func #define zval_ptr_dtor_wrapper _zval_ptr_dtor #define zval_internal_dtor_wrapper _zval_internal_dtor #define zval_internal_ptr_dtor_wrapper _zval_internal_ptr_dtor
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
