cvs: php-src(PHP_5_2) /ext/filter filter.c

tony2001 Tue Jul 25 10:36:19 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/filter filter.c Log: MFH: check g_hash for NULL before resetting it http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.7&r2=1.52.2.8&diff_format=u Index: php-src/ext/filter/filter.c diff -u php-src/ext/filter/filter.c:1.52.2.7 php-src/ext/filter/filter.c:1.52.2.8 --- php-src/ext/filter/filter.c:1.52.2.7 Mon Jul 24 03:58:41 2006 +++ php-src/ext/filter/filter.c Tue Jul 25 10:36:19 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filter.c,v 1.52.2.7 2006/07/24 03:58:41 iliaa Exp $ */ +/* $Id: filter.c,v 1.52.2.8 2006/07/25 10:36:19 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -274,7 +274,7 @@ { php_info_print_table_start(); php_info_print_table_row( 2, "Input Validation and Filtering", "enabled" ); - php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.7 $"); + php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.8 $"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); @@ -693,7 +693,9 @@ RETURN_FALSE; } else { g_hash = HASH_OF(array_ptr); - zend_hash_internal_pointer_reset_ex(g_hash, &pos); + if (g_hash) { + zend_hash_internal_pointer_reset(g_hash); + } array_init(return_value); }