This commit was manufactured by cvs2svn to create tag 'php_5_1_0RC3'.

Zend/tests/bug34873.phpt

@@ -1,27 +0,0 @@
---TEST--
-bug #34873 (Segmentation Fault on foreach in object)
---FILE--
-<?php
-class pwa {
-	public $var;
-
-	function __construct(){
-		$this->var = array();
-	}
-
-	function test (){
-		$cont = array();
-		$cont["mykey"] = "myvalue";
-
-		foreach ($cont as $this->var['key'] => $this->var['value'])
-		var_dump($this->var['value']);
-	}
-}
-$myPwa = new Pwa();
-$myPwa->test();
-
-echo "Done\n";
-?>
---EXPECT--	
-string(7) "myvalue"
-Done

Zend/zend_compile.c

@@ -3636,8 +3636,7 @@ void zend_do_foreach_cont(znode *foreach_token, znode *as_token, znode *value, z
 	}
 
 	value_node = opline->result;
- 	zend_do_end_variable_parse(BP_VAR_W, 0 TSRMLS_CC);
- 	if (assign_by_ref) {
+	if (assign_by_ref) {
 		/* Mark FE_FETCH as IS_VAR as it holds the data directly as a value */
 		zend_do_assign_ref(NULL, value, &value_node TSRMLS_CC);
 	} else {
@@ -3648,8 +3647,7 @@ void zend_do_foreach_cont(znode *foreach_token, znode *as_token, znode *value, z
 	if (key->op_type != IS_UNUSED) {
 		znode key_node;
 
- 		zend_do_end_variable_parse(BP_VAR_W, 0 TSRMLS_CC);
- 		opline = &CG(active_op_array)->opcodes[as_token->u.opline_num+1];
+		opline = &CG(active_op_array)->opcodes[as_token->u.opline_num+1];
 		opline->result.op_type = IS_TMP_VAR;
 		opline->result.u.EA.type = 0;
 		opline->result.u.opline_num = get_temporary_variable(CG(active_op_array));

Zend/zend_language_parser.y

@@ -220,7 +220,7 @@ unticked_statement:
 		foreach_statement { zend_do_foreach_end(&$1, &$5 TSRMLS_CC); }
 	|	T_FOREACH '(' expr_without_variable { zend_do_foreach_begin(&$1, &$2, &$3, 0 TSRMLS_CC); } T_AS 
 		{ zend_do_foreach_fetch(&$1, &$2, &$5 TSRMLS_CC); } 
-		variable foreach_optional_arg ')' { zend_check_writable_variable(&$7); zend_do_foreach_cont(&$1, &$5, &$7, &$8 TSRMLS_CC); } 
+		w_variable foreach_optional_arg ')' { zend_do_foreach_cont(&$1, &$5, &$7, &$8 TSRMLS_CC); } 
 		foreach_statement { zend_do_foreach_end(&$1, &$5 TSRMLS_CC); }
 	|	T_DECLARE { $1.u.opline_num = get_next_op_number(CG(active_op_array)); zend_do_declare_begin(TSRMLS_C); } '(' declare_list ')' declare_statement { zend_do_declare_end(&$1 TSRMLS_CC); }
 	|	';'		/* empty statement */
@@ -338,8 +338,8 @@ foreach_optional_arg:
 
 
 foreach_variable:
-		variable			{ zend_check_writable_variable(&$1); $$ = $1; }
-	|	'&' variable		{ zend_check_writable_variable(&$2); $$ = $2;  $$.u.EA.type |= ZEND_PARSED_REFERENCE_VARIABLE; }
+		w_variable			{ $$ = $1; }
+	|	'&' w_variable		{ $$ = $2;  $$.u.EA.type |= ZEND_PARSED_REFERENCE_VARIABLE; }
 ;
 
 for_statement: