diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-04-29 13:05:44 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-04-29 13:05:44 +0100 |
| commit | 416e22d2bb496da39e95136b1eded64869f10dd0 (patch) | |
| tree | b3867606a888d0ab96524c4243c3f33b3d138225 /Zend/zend_builtin_functions.c | |
| parent | fdeb8a199e769068a0fe13b19ff58d01915e404c (diff) | |
| parent | dbdc37ac4f440abade6f9560f093b9f8ef89db05 (diff) | |
| download | php-git-416e22d2bb496da39e95136b1eded64869f10dd0.tar.gz | |
Merge branch 'master' of https://github.com/php/php-src
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 4492766117..e5f77d8960 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -526,13 +526,13 @@ ZEND_FUNCTION(func_get_arg) arg_count = ZEND_CALL_NUM_ARGS(ex); - if (requested_offset >= arg_count) { + if ((zend_ulong)requested_offset >= arg_count) { zend_error(E_WARNING, "func_get_arg(): Argument " ZEND_LONG_FMT " not passed to function", requested_offset); RETURN_FALSE; } first_extra_arg = ex->func->op_array.num_args; - if (requested_offset >= first_extra_arg && (ZEND_CALL_NUM_ARGS(ex) > first_extra_arg)) { + if ((zend_ulong)requested_offset >= first_extra_arg && (ZEND_CALL_NUM_ARGS(ex) > first_extra_arg)) { arg = ZEND_CALL_VAR_NUM(ex, ex->func->op_array.last_var + ex->func->op_array.T) + (requested_offset - first_extra_arg); } else { arg = ZEND_CALL_ARG(ex, requested_offset + 1); @@ -755,7 +755,7 @@ ZEND_FUNCTION(each) Return the current error_reporting level, and if an argument was passed - change to the new level */ ZEND_FUNCTION(error_reporting) { - zval *err; + zval *err = NULL; int old_error_reporting; #ifndef FAST_ZPP |