Revert "Fixed Bug #72213 (Finally leaks on nested exceptions)"

laruence · laruence · commit fad91468dbf4 · 2016-05-17T20:27:16.000+08:00
This reverts commit 5037ebf.
diff --git a/Zend/tests/try/bug72213.phpt b/Zend/tests/try/bug72213.phpt
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -7087,7 +7087,7 @@ ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY)
 {
 	uint32_t op_num = EG(opline_before_exception) - EX(func)->op_array.opcodes;
 	int i;
-	uint32_t catch_op_num = 0, finally_op_num = 0, finally_op_end = 0, prev_finally_op_end = 0;
+	uint32_t catch_op_num = 0, finally_op_num = 0, finally_op_end = 0;
 	int in_finally = 0;
 
 	{
@@ -7118,7 +7118,6 @@ ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY)
 		if (op_num >= EX(func)->op_array.try_catch_array[i].finally_op &&
 				op_num < EX(func)->op_array.try_catch_array[i].finally_end) {
 			finally_op_end = EX(func)->op_array.try_catch_array[i].finally_end;
-			prev_finally_op_end = finally_op_end;
 			in_finally = 1;
 		}
 	}
@@ -7129,13 +7128,8 @@ ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY)
 		zval *fast_call = EX_VAR(EX(func)->op_array.opcodes[finally_op_end].op1.var);
 
 		cleanup_live_vars(execute_data, op_num, finally_op_num);
-		if (prev_finally_op_end) {
-			zval *prev_fast_call = EX_VAR(EX(func)->op_array.opcodes[prev_finally_op_end].op1.var);
-
-			if (Z_OBJ_P(prev_fast_call)) {
-				zend_exception_set_previous(EG(exception), Z_OBJ_P(prev_fast_call));
-				Z_OBJ_P(prev_fast_call) = NULL;
-			}
+		if (in_finally && Z_OBJ_P(fast_call)) {
+			zend_exception_set_previous(EG(exception), Z_OBJ_P(fast_call));
 		}
 		Z_OBJ_P(fast_call) = EG(exception);
 		EG(exception) = NULL;
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
@@ -1694,7 +1694,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_HANDLE_EXCEPTION_SPEC_HANDLER(
 {
 	uint32_t op_num = EG(opline_before_exception) - EX(func)->op_array.opcodes;
 	int i;
-	uint32_t catch_op_num = 0, finally_op_num = 0, finally_op_end = 0, prev_finally_op_end = 0;
+	uint32_t catch_op_num = 0, finally_op_num = 0, finally_op_end = 0;
 	int in_finally = 0;
 
 	{
@@ -1725,7 +1725,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_HANDLE_EXCEPTION_SPEC_HANDLER(
 		if (op_num >= EX(func)->op_array.try_catch_array[i].finally_op &&
 				op_num < EX(func)->op_array.try_catch_array[i].finally_end) {
 			finally_op_end = EX(func)->op_array.try_catch_array[i].finally_end;
-			prev_finally_op_end = finally_op_end;
 			in_finally = 1;
 		}
 	}
@@ -1736,13 +1735,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_HANDLE_EXCEPTION_SPEC_HANDLER(
 		zval *fast_call = EX_VAR(EX(func)->op_array.opcodes[finally_op_end].op1.var);
 
 		cleanup_live_vars(execute_data, op_num, finally_op_num);
-		if (prev_finally_op_end) {
-			zval *prev_fast_call = EX_VAR(EX(func)->op_array.opcodes[prev_finally_op_end].op1.var);
-
-			if (Z_OBJ_P(prev_fast_call)) {
-				zend_exception_set_previous(EG(exception), Z_OBJ_P(prev_fast_call));
-				Z_OBJ_P(prev_fast_call) = NULL;
-			}
+		if (in_finally && Z_OBJ_P(fast_call)) {
+			zend_exception_set_previous(EG(exception), Z_OBJ_P(fast_call));
 		}
 		Z_OBJ_P(fast_call) = EG(exception);
 		EG(exception) = NULL;

Original file line number	Diff line number	Diff line change
`@@ -7087,7 +7087,7 @@ ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY)`
`7087`	`7087`	`{`
`7088`	`7088`	`uint32_t op_num = EG(opline_before_exception) - EX(func)->op_array.opcodes;`
`7089`	`7089`	`int i;`
`7090`		`- uint32_t catch_op_num = 0, finally_op_num = 0, finally_op_end = 0, prev_finally_op_end = 0;`
	`7090`	`+ uint32_t catch_op_num = 0, finally_op_num = 0, finally_op_end = 0;`
`7091`	`7091`	`int in_finally = 0;`
`7092`	`7092`
`7093`	`7093`	`{`
`@@ -7118,7 +7118,6 @@ ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY)`
`7118`	`7118`	`if (op_num >= EX(func)->op_array.try_catch_array[i].finally_op &&`
`7119`	`7119`	`op_num < EX(func)->op_array.try_catch_array[i].finally_end) {`
`7120`	`7120`	`finally_op_end = EX(func)->op_array.try_catch_array[i].finally_end;`
`7121`		`- prev_finally_op_end = finally_op_end;`
`7122`	`7121`	`in_finally = 1;`
`7123`	`7122`	`}`
`7124`	`7123`	`}`
`@@ -7129,13 +7128,8 @@ ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY)`
`7129`	`7128`	`zval *fast_call = EX_VAR(EX(func)->op_array.opcodes[finally_op_end].op1.var);`
`7130`	`7129`
`7131`	`7130`	`cleanup_live_vars(execute_data, op_num, finally_op_num);`
`7132`		`- if (prev_finally_op_end) {`
`7133`		`- zval *prev_fast_call = EX_VAR(EX(func)->op_array.opcodes[prev_finally_op_end].op1.var);`
`7134`		`-`
`7135`		`- if (Z_OBJ_P(prev_fast_call)) {`
`7136`		`- zend_exception_set_previous(EG(exception), Z_OBJ_P(prev_fast_call));`
`7137`		`- Z_OBJ_P(prev_fast_call) = NULL;`
`7138`		`- }`
	`7131`	`+ if (in_finally && Z_OBJ_P(fast_call)) {`
	`7132`	`+ zend_exception_set_previous(EG(exception), Z_OBJ_P(fast_call));`
`7139`	`7133`	`}`
`7140`	`7134`	`Z_OBJ_P(fast_call) = EG(exception);`
`7141`	`7135`	`EG(exception) = NULL;`
Original file line number	Diff line number	Diff line change
`@@ -1694,7 +1694,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_HANDLE_EXCEPTION_SPEC_HANDLER(`
`1694`	`1694`	`{`
`1695`	`1695`	`uint32_t op_num = EG(opline_before_exception) - EX(func)->op_array.opcodes;`
`1696`	`1696`	`int i;`
`1697`		`- uint32_t catch_op_num = 0, finally_op_num = 0, finally_op_end = 0, prev_finally_op_end = 0;`
	`1697`	`+ uint32_t catch_op_num = 0, finally_op_num = 0, finally_op_end = 0;`
`1698`	`1698`	`int in_finally = 0;`
`1699`	`1699`
`1700`	`1700`	`{`
`@@ -1725,7 +1725,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_HANDLE_EXCEPTION_SPEC_HANDLER(`
`1725`	`1725`	`if (op_num >= EX(func)->op_array.try_catch_array[i].finally_op &&`
`1726`	`1726`	`op_num < EX(func)->op_array.try_catch_array[i].finally_end) {`
`1727`	`1727`	`finally_op_end = EX(func)->op_array.try_catch_array[i].finally_end;`
`1728`		`- prev_finally_op_end = finally_op_end;`
`1729`	`1728`	`in_finally = 1;`
`1730`	`1729`	`}`
`1731`	`1730`	`}`
`@@ -1736,13 +1735,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_HANDLE_EXCEPTION_SPEC_HANDLER(`
`1736`	`1735`	`zval *fast_call = EX_VAR(EX(func)->op_array.opcodes[finally_op_end].op1.var);`
`1737`	`1736`
`1738`	`1737`	`cleanup_live_vars(execute_data, op_num, finally_op_num);`
`1739`		`- if (prev_finally_op_end) {`
`1740`		`- zval *prev_fast_call = EX_VAR(EX(func)->op_array.opcodes[prev_finally_op_end].op1.var);`
`1741`		`-`
`1742`		`- if (Z_OBJ_P(prev_fast_call)) {`
`1743`		`- zend_exception_set_previous(EG(exception), Z_OBJ_P(prev_fast_call));`
`1744`		`- Z_OBJ_P(prev_fast_call) = NULL;`
`1745`		`- }`
	`1738`	`+ if (in_finally && Z_OBJ_P(fast_call)) {`
	`1739`	`+ zend_exception_set_previous(EG(exception), Z_OBJ_P(fast_call));`
`1746`	`1740`	`}`
`1747`	`1741`	`Z_OBJ_P(fast_call) = EG(exception);`
`1748`	`1742`	`EG(exception) = NULL;`