cvs: php4(PHP_4_2_0) /ext/mbstring mbstring.c

edink Mon Jul 15 14:02:09 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4/ext/mbstring mbstring.c Log: MFH Index: php4/ext/mbstring/mbstring.c diff -u php4/ext/mbstring/mbstring.c:1.48.2.9 php4/ext/mbstring/mbstring.c:1.48.2.10 --- php4/ext/mbstring/mbstring.c:1.48.2.9 Fri Jul 5 11:02:40 2002 +++ php4/ext/mbstring/mbstring.c Mon Jul 15 14:02:09 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c,v 1.48.2.9 2002/07/05 15:02:40 hirokawa Exp $ */ +/* $Id: mbstring.c,v 1.48.2.10 2002/07/15 18:02:09 edink Exp $ */ /* * PHP4 Multibyte String module "mbstring" (currently only for Japanese) @@ -1005,18 +1005,21 @@ mbfl_string_init_set(&string, MBSTRG(current_language), MBSTRG(current_internal_encoding)); mbfl_string_init_set(&resvar, MBSTRG(current_language), MBSTRG(current_internal_encoding)); mbfl_string_init_set(&resval, MBSTRG(current_language), MBSTRG(current_internal_encoding)); + + if (!res || *res == '\0') { + return; + } /* count the variables contained in the query */ - num = 0; + num = 1; var = res; - n = strlen(res); - while(n > 0) { - if (*var == '=') { - num++; - } - var++; - n--; + n = strlen(separator); + + while (var=strstr(var, separator)) { + num++; + var+=n; } + num *= 2; val_list = (char **)ecalloc(num, sizeof(char *)); len_list = (int *)ecalloc(num, sizeof(int));