com php-src: Fixed segfault in wordpress (introduced in rev 4a4529adb03a5e0d8c46809074a9bae37686e201): Zend/zend_compile .c
| From: | Xinchen Hui | Date: | Mon, 29 Jun 2015 07:13:09 +0000 |
| Subject: | com php-src: Fixed segfault in wordpress (introduced in rev 4a4529adb03a5e0d8c46809074a9bae37686e201): Zend/zend_compile .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87591@lists.php.net to get a copy of this message | ||
Commit: 5ba28d76d2e5bfe7aaa9a052898e5f759b84b4ba
Author: Xinchen Hui <laruence@php.net> Mon, 29 Jun 2015 15:13:09 +0800
Parents: b34f9bc2e9df124c790d14b98c7746246d108e3d
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5ba28d76d2e5bfe7aaa9a052898e5f759b84b4ba
Log:
Fixed segfault in wordpress (introduced in rev 4a4529adb03a5e0d8c46809074a9bae37686e201)
Changed paths:
M Zend/zend_compile.c
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 7194aac..8452568 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -6623,10 +6623,9 @@ static void zend_compile_encaps_list(znode *result, zend_ast *ast) /* {{{ */
} else {
uint32_t var;
zend_brk_cont_element *info = get_next_brk_cont_element(CG(active_op_array));
- info->brk = opline - CG(active_op_array)->opcodes;
info->start = rope_init_lineno;
info->parent = CG(context).current_brk_cont;
- info->cont = -1;
+ info->cont = info->brk = opline - CG(active_op_array)->opcodes;
init_opline->extended_value = j;
opline->opcode = ZEND_ROPE_END;