Fixed bug #76046

nikic · nikic · commit d6595f276fff · 2018-11-27T16:37:55.000+01:00
Place FE_FREE on start line of foreach, instead of whatever random
line number might be in CG(zend_lineno) at the time.
diff --git a/NEWS b/NEWS
@@ -5,6 +5,8 @@ PHP                                                                        NEWS
 - Core:
   . Fixed bug #71041 (zend_signal_startup() needs ZEND_API).
     (Valentin V. Bartenev)
+  . Fixed bug #76046 (PHP generates "FE_FREE" opcode on the wrong line).
+    (Nikita)
 
 - COM:
   . Fixed bug #77177 (Serializing or unserializing COM objects crashes). (cmb)
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -4807,6 +4807,7 @@ void zend_compile_foreach(zend_ast *ast) /* {{{ */
 
 	zend_end_loop(opnum_fetch, &reset_node);
 
+	CG(zend_lineno) = ast->lineno;
 	opline = zend_emit_op(NULL, ZEND_FE_FREE, &reset_node, NULL);
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -4807,6 +4807,7 @@ void zend_compile_foreach(zend_ast ast) / {{{ */`
`4807`	`4807`
`4808`	`4808`	`zend_end_loop(opnum_fetch, &reset_node);`
`4809`	`4809`
	`4810`	`+ CG(zend_lineno) = ast->lineno;`
`4810`	`4811`	`opline = zend_emit_op(NULL, ZEND_FE_FREE, &reset_node, NULL);`
`4811`	`4812`	`}`
`4812`	`4813`	`/* }}} */`