Make sure fast_call_var is initialized properly

laruence · laruence · commit b9e48073b32f · 2015-07-08T18:24:27.000+08:00
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -7595,9 +7595,10 @@ ZEND_VM_HANDLER(162, ZEND_FAST_CALL, ANY, ANY)
 		ZEND_VM_SET_OPCODE(&EX(func)->op_array.opcodes[opline->op2.opline_num]);
 		ZEND_VM_CONTINUE();
 	}
-	if (UNEXPECTED(Z_OBJ_P(fast_call) != NULL)) {
+	if (opline->extended_value == ZEND_FAST_CALL_FROM_FINALLY && UNEXPECTED(Z_OBJ_P(fast_call) != NULL)) {
 		fast_call->u2.lineno = (uint32_t)-1;
 	} else {
+		Z_OBJ_P(fast_call) = NULL;
 		/* set return address */
 		fast_call->u2.lineno = opline - EX(func)->op_array.opcodes;
 	}
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
@@ -1607,9 +1607,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FAST_CALL_SPEC_HANDLER(ZEND_OP
 		ZEND_VM_SET_OPCODE(&EX(func)->op_array.opcodes[opline->op2.opline_num]);
 		ZEND_VM_CONTINUE();
 	}
-	if (UNEXPECTED(Z_OBJ_P(fast_call) != NULL)) {
+	if (opline->extended_value == ZEND_FAST_CALL_FROM_FINALLY && UNEXPECTED(Z_OBJ_P(fast_call) != NULL)) {
 		fast_call->u2.lineno = (uint32_t)-1;
 	} else {
+		Z_OBJ_P(fast_call) = NULL;
 		/* set return address */
 		fast_call->u2.lineno = opline - EX(func)->op_array.opcodes;
 	}

Original file line number	Diff line number	Diff line change
`@@ -7595,9 +7595,10 @@ ZEND_VM_HANDLER(162, ZEND_FAST_CALL, ANY, ANY)`
`7595`	`7595`	`ZEND_VM_SET_OPCODE(&EX(func)->op_array.opcodes[opline->op2.opline_num]);`
`7596`	`7596`	`ZEND_VM_CONTINUE();`
`7597`	`7597`	`}`
`7598`		`- if (UNEXPECTED(Z_OBJ_P(fast_call) != NULL)) {`
	`7598`	`+ if (opline->extended_value == ZEND_FAST_CALL_FROM_FINALLY && UNEXPECTED(Z_OBJ_P(fast_call) != NULL)) {`
`7599`	`7599`	`fast_call->u2.lineno = (uint32_t)-1;`
`7600`	`7600`	`} else {`
	`7601`	`+ Z_OBJ_P(fast_call) = NULL;`
`7601`	`7602`	`/* set return address */`
`7602`	`7603`	`fast_call->u2.lineno = opline - EX(func)->op_array.opcodes;`
`7603`	`7604`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1607,9 +1607,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FAST_CALL_SPEC_HANDLER(ZEND_OP`
`1607`	`1607`	`ZEND_VM_SET_OPCODE(&EX(func)->op_array.opcodes[opline->op2.opline_num]);`
`1608`	`1608`	`ZEND_VM_CONTINUE();`
`1609`	`1609`	`}`
`1610`		`- if (UNEXPECTED(Z_OBJ_P(fast_call) != NULL)) {`
	`1610`	`+ if (opline->extended_value == ZEND_FAST_CALL_FROM_FINALLY && UNEXPECTED(Z_OBJ_P(fast_call) != NULL)) {`
`1611`	`1611`	`fast_call->u2.lineno = (uint32_t)-1;`
`1612`	`1612`	`} else {`
	`1613`	`+ Z_OBJ_P(fast_call) = NULL;`
`1613`	`1614`	`/* set return address */`
`1614`	`1615`	`fast_call->u2.lineno = opline - EX(func)->op_array.opcodes;`
`1615`	`1616`	`}`