]> granicus.if.org Git - php/commitdiff
Eliminated useless check in FAST_ZPP (this also fixed few wrong -Wmaybe-uninitialized...
authorDmitry Stogov <dmitry@zend.com>
Tue, 19 May 2015 08:06:01 +0000 (11:06 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 19 May 2015 08:06:01 +0000 (11:06 +0300)
Zend/zend_API.h

index f61091ae727b274796e981391c48dee6d2e25255..1c1aafbdcee600a6dab9f376eed7769a2e3cb2ae 100644 (file)
@@ -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); \
                }