andrei Fri Oct 18 09:07:51 2002 EDT Modified files: /php4/ext/standard string.c Log: @- Fixed an infinite loop in setlocale() when only invalid locale names @ were passed in the array. (patch by Pal Loberg, [EMAIL PROTECTED]). Index: php4/ext/standard/string.c diff -u php4/ext/standard/string.c:1.325 php4/ext/standard/string.c:1.326 --- php4/ext/standard/string.c:1.325 Thu Oct 17 18:44:44 2002 +++ php4/ext/standard/string.c Fri Oct 18 09:07:50 2002 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.325 2002/10/17 22:44:44 iliaa Exp $ */ +/* $Id: string.c,v 1.326 2002/10/18 13:07:50 andrei Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -3225,7 +3225,7 @@ } if (Z_TYPE_PP(args[1]) == IS_ARRAY) { - zend_hash_move_forward(Z_ARRVAL_PP(args[1])); + if (zend_hash_move_forward(Z_ARRVAL_PP(args[1])) == FAILURE) +break; } else { if (++i >= n_args) break; }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php