com php-src: Prohibited parameter redefinition: Zend/zend_com pile.c
| From: | Dmitry Stogov | Date: | Mon, 30 Jun 2014 11:40:28 +0000 |
| Subject: | com php-src: Prohibited parameter redefinition: Zend/zend_com pile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79281@lists.php.net to get a copy of this message | ||
Commit: 45082daa3a721896f1e306aa6eafb00a57bd1cc7
Author: Dmitry Stogov <dmitry@zend.com> Mon, 30 Jun 2014 15:40:28 +0400
Parents: 3f0ee308a04819f520c861b8edb34703eabf377c
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=45082daa3a721896f1e306aa6eafb00a57bd1cc7
Log:
Prohibited parameter redefinition
Changed paths:
M Zend/zend_compile.c
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index a49195d..647fab4 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -1844,7 +1844,9 @@ void zend_do_receive_param(zend_uchar op, znode *varname, znode
*initialization,
var.u.op.var = lookup_cv(CG(active_op_array), Z_STR(varname->u.constant) TSRMLS_CC);
Z_STR(varname->u.constant) = CG(active_op_array)->vars[EX_VAR_TO_NUM(var.u.op.var)];
var.EA = 0;
- if (Z_STRHASH(varname->u.constant) == THIS_HASHVAL &&
+ if (EX_VAR_TO_NUM(var.u.op.var) != CG(active_op_array)->num_args) {
+ zend_error_noreturn(E_COMPILE_ERROR, "Redefinition of parameter %s",
Z_STRVAL(varname->u.constant));
+ } else if (Z_STRHASH(varname->u.constant) == THIS_HASHVAL &&
Z_STRLEN(varname->u.constant) == sizeof("this")-1 &&
!memcmp(Z_STRVAL(varname->u.constant), "this", sizeof("this")-1)) {
if (CG(active_op_array)->scope &&