summaryrefslogtreecommitdiff
path: root/tests/basic
diff options
context:
space:
mode:
authorJoe Watkins <krakjoe@php.net>2017-01-22 16:12:09 +0000
committerJoe Watkins <krakjoe@php.net>2017-01-22 16:12:27 +0000
commit8782e847b4f0e53b4c0f3e89944b4b7106c4d28f (patch)
treebfad280d1e580df788f7db05085ff534a2eeae08 /tests/basic
parentab2489fae283d3f97dea40047d59f8baa947da1e (diff)
parent8bda5420648021dd6f92bac45915d6422b636df3 (diff)
downloadphp-git-8782e847b4f0e53b4c0f3e89944b4b7106c4d28f.tar.gz
Merge branch 'PHP-7.1'
* PHP-7.1: Fixed #73969 - Fixed segmentation fault when debug_print_backtrace called
Diffstat (limited to 'tests/basic')
-rw-r--r--tests/basic/bug73969.inc2
-rw-r--r--tests/basic/bug73969.phpt30
2 files changed, 32 insertions, 0 deletions
diff --git a/tests/basic/bug73969.inc b/tests/basic/bug73969.inc
new file mode 100644
index 0000000000..61b331769c
--- /dev/null
+++ 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
new file mode 100644
index 0000000000..11cfecd16b
--- /dev/null
+++ 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]