diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rwxr-xr-x | Zend/tests/bug41117_1.phpt | 14 | ||||
| -rw-r--r-- | Zend/zend_compile.c | 11 |
3 files changed, 25 insertions, 1 deletions
@@ -1,6 +1,7 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Apr 2007, PHP 5.2.3RC3 +- Fixed altering $this via argument named "this". (Dmitry) - Fixed iterator_apply() with a callback using __call(). (Johannes) - Fixed bug #41215 (setAttribute return code reversed). (Ilia) - Fixed bug #41192 (Per Directory Values only work for one key). (Dmitry) diff --git a/Zend/tests/bug41117_1.phpt b/Zend/tests/bug41117_1.phpt new file mode 100755 index 0000000000..f555b637ad --- /dev/null +++ b/Zend/tests/bug41117_1.phpt @@ -0,0 +1,14 @@ +--TEST-- +Bug #41117 (Altering $this via argument) +--FILE-- +<?php +class foo { + function __construct($this) { + echo $this."\n"; + } +} +$obj = new foo("Hello world"); +?> +--EXPECTF-- +Fatal error: Cannot re-assign $this in %sbug41117_1.php on line 3 + diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 3d4afa8f81..c660d83cf4 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1265,9 +1265,18 @@ void zend_do_end_function_declaration(znode *function_token TSRMLS_DC) void zend_do_receive_arg(zend_uchar op, znode *var, znode *offset, znode *initialization, znode *class_type, znode *varname, zend_uchar pass_by_reference TSRMLS_DC) { - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); + zend_op *opline; zend_arg_info *cur_arg_info; + if (CG(active_op_array)->scope && + ((CG(active_op_array)->fn_flags & ZEND_ACC_STATIC) == 0) && + (Z_TYPE(varname->u.constant) == IS_STRING) && + (Z_STRLEN(varname->u.constant) == sizeof("this")-1) && + (memcmp(Z_STRVAL(varname->u.constant), "this", sizeof("this")) == 0)) { + zend_error(E_COMPILE_ERROR, "Cannot re-assign $this"); + } + + opline = get_next_op(CG(active_op_array) TSRMLS_CC); CG(active_op_array)->num_args++; opline->opcode = op; opline->result = *var; |