diff options
author | Dmitry Stogov <dmitry@zend.com> | 2015-05-19 11:06:01 +0300 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2015-05-19 11:06:01 +0300 |
commit | b3d053b036e564e9bce6df705de8710823a43016 (patch) | |
tree | 1e3caaa874989b896401fb835480518557f941d7 /Zend/zend_API.h | |
parent | f378b9a998061cd2bbe3e81601aa64be8463ac5b (diff) | |
download | php-git-b3d053b036e564e9bce6df705de8710823a43016.tar.gz |
Eliminated useless check in FAST_ZPP (this also fixed few wrong -Wmaybe-uninitialized compilation warnings) (Remi)
Diffstat (limited to 'Zend/zend_API.h')
-rw-r--r-- | Zend/zend_API.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h index f61091ae72..1c1aafbdce 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -1010,7 +1010,8 @@ ZEND_API void ZEND_FASTCALL zend_wrong_callback_error(int severity, int num, cha Z_PARAM_PROLOGUE(separate); \ zend_parse_arg_zval_deref(_arg, &dest, check_null); \ } else { \ - if (UNEXPECTED(++_i >_num_args)) break; \ + ++_i; \ + if (_optional && UNEXPECTED(_i >_num_args)) break; \ _real_arg++; \ zend_parse_arg_zval(_real_arg, &dest, check_null); \ } |