Merge branch 'master' of github.com:xdebug/xdebug

xdebug · Jun 3, 2015 · c586716 · c586716
2 parents a323117 + d5594f3
commit c586716
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/xdebug_stack.c b/xdebug_stack.c
@@ -994,6 +994,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