| Dmitry Stogov 2005-10-17, 3:55 am |
| dmitry Mon Oct 17 04:01:07 2005 EDT
Modified files:
/ZendEngine2 zend_compile.c zend_language_parser.y
/ZendEngine2/tests bug34873.phpt
Log:
Fixed bug #34873 (Segmentation Fault on foreach in object)
http://cvs.php.net/diff.php/ZendEng...9&r2=1.670&ty=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.669 ZendEngine2/zend_compile.c:1.670
--- ZendEngine2/zend_compile.c:1.669 Mon Oct 17 03:03:33 2005
+++ ZendEngine2/zend_compile.c Mon Oct 17 04:01:06 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_compile.c,v 1.669 2005/10/17 07:03:33 derick Exp $ */
+/* $Id: zend_compile.c,v 1.670 2005/10/17 08:01:06 dmitry Exp $ */
#include <zend_language_parser.h>
#include "zend.h"
@@ -3792,6 +3792,8 @@
}
value_node = opline->result;
+
+ zend_do_end_variable_parse(BP_VAR_W, 0 TSRMLS_CC);
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);
@@ -3803,6 +3805,7 @@
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->result.op_type = IS_TMP_VAR;
opline->result.u.EA.type = 0;
http://cvs.php.net/diff.php/ZendEng...2&r2=1.163&ty=u
Index: ZendEngine2/zend_language_parser.y
diff -u ZendEngine2/zend_language_parser.y:1.162 ZendEngine2/zend_language_parser.y:1.163
--- ZendEngine2/zend_language_parser.y:1.162 Wed Sep 21 05:56:35 2005
+++ ZendEngine2/zend_language_parser.y Mon Oct 17 04:01:06 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_language_parser.y,v 1.162 2005/09/21 09:56:35 helly Exp $ */
+/* $Id: zend_language_parser.y,v 1.163 2005/10/17 08:01:06 dmitry Exp $ */
/*
* LALR shift/reduce conflicts and how they are resolved:
@@ -222,7 +222,7 @@
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); }
- w_variable foreach_optional_arg ')' { zend_do_foreach_cont(&$1, &$5, &$7, &$8 TSRMLS_CC); }
+ variable foreach_optional_arg ')' { zend_check_writable_variable(&$7); 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 */
@@ -340,8 +340,8 @@
foreach_variable:
- w_variable { $$ = $1; }
- | '&' w_variable { $$ = $2; $$.u.EA.type |= ZEND_PARSED_REFERENCE_VARIABLE; }
+ variable { zend_check_writable_variable(&$1); $$ = $1; }
+ | '&' variable { zend_check_writable_variable(&$2); $$ = $2; $$.u.EA.type |= ZEND_PARSED_REFERENCE_VARIABLE; }
;
for_statement:
http://cvs.php.net/diff.php/ZendEng...1.1&r2=1.2&ty=u
Index: ZendEngine2/tests/bug34873.phpt
diff -u ZendEngine2/tests/bug34873.phpt:1.1 ZendEngine2/tests/bug34873.phpt:1.2
--- ZendEngine2/tests/bug34873.phpt:1.1 Fri Oct 14 17:50:46 2005
+++ ZendEngine2/tests/bug34873.phpt Mon Oct 17 04:01:07 2005
@@ -25,3 +25,6 @@
--EXPECT--
string(7) "myvalue"
Done
+--UEXPECT--
+unicode(7) "myvalue"
+Done
|