From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 19 May 2015 08:06:01 +0000 (+0300)
Subject: Eliminated useless check in FAST_ZPP (this also fixed few wrong -Wmaybe-uninitialized... 
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~42^2~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3d053b036e564e9bce6df705de8710823a43016;p=php

Eliminated useless check in FAST_ZPP (this also fixed few wrong -Wmaybe-uninitialized compilation warnings) (Remi)
---

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); \
 		}