1 files changed, 18 insertions, 2 deletions

diff --git a/src/sp_execute.c b/src/sp_execute.c
index 1517134..bb9f64e 100644
--- a/src/sp_execute.c
+++ b/src/sp_execute.c
@@ -119,8 +119,24 @@ char *get_eval_filename(const char *const filename) {
 static void sp_execute_ex(zend_execute_data *execute_data) {
   is_in_eval_and_whitelisted(execute_data);
 
-  if (UNEXPECTED(true == should_disable(execute_data, NULL, NULL, NULL))) {
-    sp_terminate();
+  if (!execute_data) {
+    return;
+  } else if (!execute_data->prev_execute_data ||
+             !execute_data->prev_execute_data->func ||
+             !ZEND_USER_CODE(execute_data->prev_execute_data->func->type) ||
+             !execute_data->prev_execute_data->opline) {
+    if (UNEXPECTED(true == should_disable(execute_data, NULL, NULL, NULL))) {
+      sp_terminate();
+    }
+  } else if (execute_data->prev_execute_data != NULL) {
+    if ((execute_data->prev_execute_data->opline->opcode == ZEND_DO_FCALL ||
+         execute_data->prev_execute_data->opline->opcode == ZEND_DO_UCALL ||
+         execute_data->prev_execute_data->opline->opcode ==
+             ZEND_DO_FCALL_BY_NAME)) {
+      if (UNEXPECTED(true == should_disable(execute_data, NULL, NULL, NULL))) {
+        sp_terminate();
+      }
+    }
   }
 
   if (UNEXPECTED(EX(func)->op_array.type == ZEND_EVAL_CODE)) {