nikic Fri, 02 Mar 2012 08:04:51 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=323803
Log: Fix bug #61106 Segfault when using header_register_callback The callback was double dtored Bug: https://bugs.php.net/61106 (Open) Segfault when using header_register_callback Changed paths: U php/php-src/branches/PHP_5_4/main/SAPI.c U php/php-src/trunk/main/SAPI.c Modified: php/php-src/branches/PHP_5_4/main/SAPI.c =================================================================== --- php/php-src/branches/PHP_5_4/main/SAPI.c 2012-03-02 07:54:56 UTC (rev 323802) +++ php/php-src/branches/PHP_5_4/main/SAPI.c 2012-03-02 08:04:51 UTC (rev 323803) @@ -494,9 +494,6 @@ SAPI_API void sapi_deactivate(TSRMLS_D) { zend_llist_destroy(&SG(sapi_headers).headers); - if (SG(callback_func)) { - zval_ptr_dtor(&SG(callback_func)); - } if (SG(request_info).post_data) { efree(SG(request_info).post_data); } else if (SG(server_context)) { Modified: php/php-src/trunk/main/SAPI.c =================================================================== --- php/php-src/trunk/main/SAPI.c 2012-03-02 07:54:56 UTC (rev 323802) +++ php/php-src/trunk/main/SAPI.c 2012-03-02 08:04:51 UTC (rev 323803) @@ -494,9 +494,6 @@ SAPI_API void sapi_deactivate(TSRMLS_D) { zend_llist_destroy(&SG(sapi_headers).headers); - if (SG(callback_func)) { - zval_ptr_dtor(&SG(callback_func)); - } if (SG(request_info).post_data) { efree(SG(request_info).post_data); } else if (SG(server_context)) {
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
