tony2001 Thu Sep 27 09:14:56 2007 UTC
Modified files:
/php-src/ext/reflection php_reflection.c
Log:
fix coverity issue #411
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.283&r2=1.284&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.283
php-src/ext/reflection/php_reflection.c:1.284
--- php-src/ext/reflection/php_reflection.c:1.283 Tue Sep 11 11:16:46 2007
+++ php-src/ext/reflection/php_reflection.c Thu Sep 27 09:14:56 2007
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_reflection.c,v 1.283 2007/09/11 11:16:46 dmitry Exp $ */
+/* $Id: php_reflection.c,v 1.284 2007/09/27 09:14:56 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2018,7 +2018,7 @@
{
reflection_object *intern;
parameter_reference *param;
- zend_class_entry **pce;
+ zend_class_entry **pce, *ce;
METHOD_NOTSTATIC_NUMPARAMS(reflection_parameter_ptr, 0);
GET_REFLECTION_OBJECT_PTR(param);
@@ -2038,7 +2038,7 @@
* lint-mode.
*/
if (ZEND_U_EQUAL(ZEND_STR_TYPE, param->arg_info->class_name,
param->arg_info->class_name_len, "self", sizeof("self")- 1)) {
- zend_class_entry *ce= param->fptr->common.scope;
+ ce = param->fptr->common.scope;
if (!ce) {
zend_throw_exception_ex(reflection_exception_ptr, 0
TSRMLS_CC,
"Parameter uses 'self' as type hint but
function is not a class member!");
@@ -2046,7 +2046,7 @@
}
pce= &ce;
} else if (ZEND_U_EQUAL(ZEND_STR_TYPE,
param->arg_info->class_name, param->arg_info->class_name_len, "parent",
sizeof("parent")- 1)) {
- zend_class_entry *ce= param->fptr->common.scope;
+ ce = param->fptr->common.scope;
if (!ce) {
zend_throw_exception_ex(reflection_exception_ptr, 0
TSRMLS_CC,
"Parameter uses 'parent' as type hint but
function is not a class member!");
@@ -5022,7 +5022,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.283
2007/09/11 11:16:46 dmitry Exp $");
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.284
2007/09/27 09:14:56 tony2001 Exp $");
php_info_print_table_end();
} /* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
