Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0: Fixed #73969 - Fixed segmentation fault when debug_print_backtrace called
Bellardia · Jan 22, 2017 · 8bda542 · 8bda542
2 parents 4af464a + 6f912f7
commit 8bda542
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 6 deletions.
diff --git a/NEWS b/NEWS
@@ -8,6 +8,7 @@ PHP                                                                        NEWS
   . Fixed bug #73876 (Crash when exporting **= in expansion of assign op).
     (Sara)
   . Fixed bug #73962 (bug with symlink related to cyrillic directory). (Anatol)
+  . Fixed bug #73969 (segfault in debug_print_backtrace). (andrewnester)
 
 - DTrace:
   . Fixed bug #73965 (DTrace reported as enabled when disabled). (Remi)

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
@@ -2447,12 +2447,17 @@ ZEND_FUNCTION(debug_print_backtrace)
 
 		if (call->func) {
 			func = call->func;
-			function_name = (func->common.scope &&
-			                 func->common.scope->trait_aliases) ?
-				ZSTR_VAL(zend_resolve_method_name(
-					(object ? object->ce : func->common.scope), func)) :
-				(func->common.function_name ?
-					ZSTR_VAL(func->common.function_name) : NULL);
+			zend_string *zend_function_name;
+            if (func->common.scope && func->common.scope->trait_aliases) {
+                zend_function_name = zend_resolve_method_name(object ? object->ce : func->common.scope, func);
+            } else {
+                zend_function_name = func->common.function_name;
+            }
+            if (zend_function_name != NULL) {
+                function_name = ZSTR_VAL(zend_function_name);
+            } else {
+                function_name = NULL;
+            }
 		} else {
 			func = NULL;
 			function_name = NULL;

diff --git a/tests/basic/bug73969.inc b/tests/basic/bug73969.inc
@@ -0,0 +1,2 @@
+<?php
+debug_print_backtrace();
diff --git a/tests/basic/bug73969.phpt b/tests/basic/bug73969.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Bug #73969: segfault on debug_print_backtrace with require() call
+--FILE--
+<?php
+trait c2
+{
+    public static function f1()
+    {
+
+    }
+}
+
+class c1
+{
+    use c2
+    {
+        c2::f1 as f2;
+    }
+
+    public static function go()
+    {
+        return require('bug73969.inc');
+    }
+}
+
+c1::go();
+?>
+--EXPECTF--
+#0  require() called at [%s:19]
+#1  c1::go() called at [%s:23]