summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-08-21 22:13:22 +0200
committerAnatol Belski <ab@php.net>2014-08-21 22:13:22 +0200
commit9d760498c13deff1610e2fe5190955632457c75d (patch)
tree9ea1ce496f68846f05e10e5462e6430af53bc4ae
parent96a570cb0384b4f18de99699c893fb24972b7912 (diff)
downloadphp-git-9d760498c13deff1610e2fe5190955632457c75d.tar.gz
fixed array_pad()
-rw-r--r--ext/standard/array.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c
index da6122ba87..22a26941ed 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2812,8 +2812,8 @@ PHP_FUNCTION(array_pad)
HashTable old_hash;
php_int_t pad_size; /* Size to pad to */
php_int_t pad_size_abs; /* Absolute value of pad_size */
- int input_size; /* Size of the input array */
- int num_pads; /* How many pads do we need */
+ php_int_t input_size; /* Size of the input array */
+ php_int_t num_pads; /* How many pads do we need */
int do_pad; /* Whether we should do padding at all */
int i;
@@ -2841,7 +2841,7 @@ PHP_FUNCTION(array_pad)
/* Populate the pads array */
num_pads = pad_size_abs - input_size;
- if (num_pads > 1048576) {
+ if (num_pads > Z_I(1048576)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "You may only pad up to 1048576 elements at a time");
zval_dtor(return_value);
RETURN_FALSE;