php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 08:12:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

a: try { ... } ≠ try { a: ... }

Browse Source
This commit is contained in:
Bob Weinand
2015-07-10 23:29:07 +02:00
parent ed62db9abc
commit 56800e470b
2 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Zend/tests/try/finally_goto_005.phpt Normal file
View File

@@ -0,0 +1,15 @@
--TEST--
There must be a difference between label: try { ... } and try { label: ... }
--FILE--
<?php
label: try {
goto label;
} finally {
print "success";
return; // don't loop
}
?>
--EXPECT--
success

19
Zend/zend_compile.c
View File

@@ -4060,14 +4060,29 @@ void zend_compile_try(zend_ast *ast) /* {{{ */
uint32_t i;
zend_op *opline;
uint32_t try_catch_offset = zend_add_try_element(
get_next_op_number(CG(active_op_array)));
uint32_t try_catch_offset;
uint32_t *jmp_opnums = safe_emalloc(sizeof(uint32_t), catches->children, 0);
HashPosition hpos;
if (catches->children == 0 && !finally_ast) {
zend_error_noreturn(E_COMPILE_ERROR, "Cannot use try without catch or finally");
}
/* label: try { } must not be equal to try { label: } */
if (CG(context).labels) {
zval *labelzv;
zend_hash_internal_pointer_end_ex(CG(context).labels, &hpos);
if ((labelzv = zend_hash_get_current_data_ex(CG(context).labels, &hpos))) {
zend_label *label = Z_PTR_P(labelzv);
if (label->opline_num == get_next_op_number(CG(active_op_array))) {
/* using a NOP doesn't work here, it would be removed by opcache */
zend_emit_jump(get_next_op_number(CG(active_op_array)) + 1);
}
}
}
try_catch_offset = zend_add_try_element(get_next_op_number(CG(active_op_array)));
zend_compile_stmt(try_ast);
if (catches->children != 0) {