]> granicus.if.org Git - php/commitdiff
Fixed segfault in wordpress (introduced in rev 4a4529adb03a5e0d8c46809074a9bae37686e201)
authorXinchen Hui <laruence@php.net>
Mon, 29 Jun 2015 07:13:09 +0000 (15:13 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 29 Jun 2015 07:13:09 +0000 (15:13 +0800)
Zend/zend_compile.c

index 7194aacdb558997ef296b25ae4977033e2532481..84525683821dba2d90573c1fb0aa7cbfe27a68e4 100644 (file)
@@ -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;