mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-28 04:14:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #34310 (foreach($arr as $c->d => $x) crashes)

Browse Source
This commit is contained in:
Dmitry Stogov 2005-09-01 10:54:38 +00:00
parent 248345d920
commit 40f971b5b6
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -18,6 +18,7 @@ PHP NEWS
- Fixed "make test" to work for phpized extensions. (Hartmut, Jani)
- Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems.
(Andrey)
- Fixed bug #34310 (foreach($arr as $c->d => $x) crashes). (Dmitry)
- Fixed bug #34306 (wddx_serialize_value() crashes with long array keys). (Jani)
- Fixed bug #34302 (date('W') do not return leading zeros for week 1 to 9).
(Derick)

2
Zend/tests/bug34310.phpt
View File

@ -5,7 +5,7 @@ Bug #34310 (foreach($arr as $c->d => $x) crashes)
class C
{
var $d;
public $d;
}
$c = new C();

10
Zend/zend_compile.c
View File

@ -543,14 +543,20 @@ void zend_do_assign(znode *result, znode *variable, znode *value TSRMLS_DC)
if (last_op_number > 0) {
zend_op *last_op = &CG(active_op_array)->opcodes[last_op_number-1];
if (last_op->opcode == ZEND_FETCH_OBJ_W) {
if (variable->op_type == IS_VAR &&
last_op->opcode == ZEND_FETCH_OBJ_W &&
last_op->result.op_type == IS_VAR &&
last_op->result.u.var == variable->u.var) {
last_op->opcode = ZEND_ASSIGN_OBJ;
zend_do_op_data(opline, value TSRMLS_CC);
SET_UNUSED(opline->result);
*result = last_op->result;
return;
} else if (last_op->opcode == ZEND_FETCH_DIM_W) {
} else if (variable->op_type == IS_VAR &&
last_op->opcode == ZEND_FETCH_DIM_W &&
last_op->result.op_type == IS_VAR &&
last_op->result.u.var == variable->u.var) {
last_op->opcode = ZEND_ASSIGN_DIM;
zend_do_op_data(opline, value TSRMLS_CC);