From: Joe Watkins <krakjoe@php.net>
Date: Mon, 11 Apr 2016 12:24:37 +0000 (+0100)
Subject: handle dummy frame
X-Git-Tag: php-7.0.6RC1~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0b821d2e941daf7ff9a4b43765d4f32a4c79c6b;p=php

handle dummy frame
---

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index bdb9bb7bd5..1cbbc1a0a1 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -786,6 +786,9 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache) /
 	if (func->common.fn_flags & (ZEND_ACC_ABSTRACT|ZEND_ACC_DEPRECATED)) {
 		if (func->common.fn_flags & ZEND_ACC_ABSTRACT) {
 			zend_throw_error(NULL, "Cannot call abstract method %s::%s()", ZSTR_VAL(func->common.scope->name), ZSTR_VAL(func->common.function_name));
+			if (EG(current_execute_data) == &dummy_execute_data) {
+				EG(current_execute_data) = dummy_execute_data.prev_execute_data;
+			}
 			return FAILURE;
 		}
 		if (func->common.fn_flags & ZEND_ACC_DEPRECATED) {