com php-src: Fixed context info in error message: Zend/zend_c ompile.c
| From: | Xinchen Hui | Date: | Fri, 17 Aug 2012 13:18:20 +0000 |
| Subject: | com php-src: Fixed context info in error message: Zend/zend_c ompile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-69861@lists.php.net to get a copy of this message | ||
Commit: 24493652382c985b13a9ed94aae5fffae16a6895
Author: Xinchen Hui <laruence@php.net> Fri, 17 Aug 2012 21:18:20 +0800
Parents: 3d93c888117a3f4e00f2e6a228d134eb336de2c2
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=24493652382c985b13a9ed94aae5fffae16a6895
Log:
Fixed context info in error message
Changed paths:
M Zend/zend_compile.c
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index d7ca6ea..bad9411 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -2289,6 +2289,11 @@ void zend_resolve_goto_label(zend_op_array *op_array, zend_op *opline, int
pass2
end = op_array->opcodes + opline->op1.opline_num;
while (++p < end) {
if (p->opcode == ZEND_LEAVE) {
+ if (pass2) {
+ CG(in_compilation) = 1;
+ CG(active_op_array) = op_array;
+ CG(zend_lineno) = opline->lineno;
+ }
zend_error(E_COMPILE_ERROR, "'goto' out of a finally block is
disallowed");
}
}