summaryrefslogtreecommitdiffstats
path: root/xdebug-pr178.patch
diff options
context:
space:
mode:
Diffstat (limited to 'xdebug-pr178.patch')
-rw-r--r--xdebug-pr178.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/xdebug-pr178.patch b/xdebug-pr178.patch
new file mode 100644
index 0000000..237ade0
--- /dev/null
+++ b/xdebug-pr178.patch
@@ -0,0 +1,22 @@
+From 1958b346aea595a67d15978f9a38d413c4147e8e Mon Sep 17 00:00:00 2001
+From: Derick Rethans <github@derickrethans.nl>
+Date: Fri, 29 May 2015 13:20:53 +0100
+Subject: [PATCH] Fixed issue #1151: Crash when another extension calls
+ call_user_function() during RINIT
+
+---
+ xdebug_stack.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/xdebug_stack.c b/xdebug_stack.c
+index 2c7d94e..4be99d2 100644
+--- a/xdebug_stack.c
++++ b/xdebug_stack.c
+@@ -993,6 +993,7 @@ function_stack_entry *xdebug_add_stack_frame(zend_execute_data *zdata, zend_op_a
+ /* Call user function locations */
+ if (
+ !tmp->filename &&
++ XG(stack) &&
+ XDEBUG_LLIST_TAIL(XG(stack)) &&
+ XDEBUG_LLIST_VALP(XDEBUG_LLIST_TAIL(XG(stack))) &&
+ ((function_stack_entry*) XDEBUG_LLIST_VALP(XDEBUG_LLIST_TAIL(XG(stack))))->filename