com php-src: fix data types: ext/mbstring/mb_gpc.c

Commit: 98fe82cc0562dfd828c8fddb8de8c3b37e0210ff Author: Anatol Belski <ab@php.net> Tue, 25 Jul 2017 21:26:25 +0200 Parents: 13a26290054fa9036abef37889bc678791935232 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=98fe82cc0562dfd828c8fddb8de8c3b37e0210ff Log: fix data types Changed paths: M ext/mbstring/mb_gpc.c Diff: diff --git a/ext/mbstring/mb_gpc.c b/ext/mbstring/mb_gpc.c index 1cd44c9..2a87ecc 100644 --- a/ext/mbstring/mb_gpc.c +++ b/ext/mbstring/mb_gpc.c @@ -196,7 +196,7 @@ const mbfl_encoding *_php_mb_encoding_handler_ex(const php_mb_encoding_handler_i const char *s1, *s2; char *strtok_buf = NULL, **val_list = NULL; zval *array_ptr = (zval *) arg; - int n, num, *len_list = NULL; + size_t n, num, *len_list = NULL; size_t val_len, new_val_len; mbfl_string string, resvar, resval; const mbfl_encoding *from_encoding = NULL; @@ -225,7 +225,7 @@ const mbfl_encoding *_php_mb_encoding_handler_ex(const php_mb_encoding_handler_i num *= 2; /* need space for variable name and value */ val_list = (char **)ecalloc(num, sizeof(char *)); - len_list = (int *)ecalloc(num, sizeof(int)); + len_list = (size_t *)ecalloc(num, sizeof(size_t)); /* split and decode the query */ n = 0; @@ -253,7 +253,7 @@ const mbfl_encoding *_php_mb_encoding_handler_ex(const php_mb_encoding_handler_i var = php_strtok_r(NULL, info->separator, &strtok_buf); } - if (n > (PG(max_input_vars) * 2)) { + if (ZEND_SIZE_T_GT_ZEND_LONG(n, (PG(max_input_vars) * 2))) { php_error_docref(NULL, E_WARNING, "Input variables exceeded " ZEND_LONG_FMT ". To increase the limit change max_input_vars in php.ini.", PG(max_input_vars)); goto out; }