diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-11-27 16:37:55 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-11-27 16:37:55 +0100 |
| commit | d6595f276fff44aa5d1d2dde7238d540a267d0dd (patch) | |
| tree | cf53c9829ca1118ecfc441d815eb2b0204275cba | |
| parent | 9ec519e09499c3f2749e298b097da132f746d4d8 (diff) | |
| download | php-git-d6595f276fff44aa5d1d2dde7238d540a267d0dd.tar.gz | |
Fixed bug #76046
Place FE_FREE on start line of foreach, instead of whatever random
line number might be in CG(zend_lineno) at the time.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | Zend/zend_compile.c | 1 |
2 files changed, 3 insertions, 0 deletions
@@ -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 index f1dd49a223..9c0893b773 100644 --- 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); } /* }}} */ |