From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 24 Feb 2014 13:29:45 +0000 (+0400)
Subject: Fixed debug_backtrace
X-Git-Tag: POST_PHPNG_MERGE~412^2~550
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0907f22bbd161bde20d6c91b1b6451da4ef423bb;p=php

Fixed debug_backtrace
---

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 4595e52112..865e0d5ae5 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -2235,7 +2235,9 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int
 						Z_OBJCE(ptr->object) : 
 						ptr->function_state.function->common.scope,
 					ptr->function_state.function)->val :
-				ptr->function_state.function->common.function_name->val;
+				(ptr->function_state.function->common.function_name ?
+				 ptr->function_state.function->common.function_name->val : 
+				 NULL);
 
 		if (function_name) {
 			add_assoc_string_ex(&stack_frame, "function", sizeof("function")-1, (char*)function_name, 1);