tony2001 Tue Jul 29 07:29:22 2008 UTC
Modified files:
/php-src/ext/reflection php_reflection.c
Log:
add TSRMLS_DC and fix crash in ZTS mode
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.304&r2=1.305&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.304
php-src/ext/reflection/php_reflection.c:1.305
--- php-src/ext/reflection/php_reflection.c:1.304 Sat Jul 26 13:14:56 2008
+++ php-src/ext/reflection/php_reflection.c Tue Jul 29 07:29:22 2008
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_reflection.c,v 1.304 2008/07/26 13:14:56 dmitry Exp $ */
+/* $Id: php_reflection.c,v 1.305 2008/07/29 07:29:22 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -4565,15 +4565,13 @@
}
/* }}} */
-static int _addconstant(zend_constant *constant, int num_args, va_list args,
zend_hash_key *hash_key) /* {{{ */
+static int _addconstant(zend_constant *constant TSRMLS_DC, int num_args,
va_list args, zend_hash_key *hash_key) /* {{{ */
{
zval *const_val;
zval *retval = va_arg(args, zval*);
int number = va_arg(args, int);
if (number == constant->module_number) {
- TSRMLS_FETCH();
-
ALLOC_ZVAL(const_val);
*const_val = constant->value;
zval_copy_ctor(const_val);
@@ -5259,7 +5257,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Reflection", "enabled");
- php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.304
2008/07/26 13:14:56 dmitry Exp $");
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.305
2008/07/29 07:29:22 tony2001 Exp $");
php_info_print_table_end();
} /* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
