summaryrefslogtreecommitdiff
path: root/Zend/tests
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2014-11-10 13:51:01 +0800
committerXinchen Hui <laruence@php.net>2014-11-10 13:51:24 +0800
commit3ae9399e400e07c5ade6f39f9419b2ad598c3e74 (patch)
treec26fac73a166dccc16c7dde849898f16deb97a5a /Zend/tests
parent12cf41ca356800d5ff77b08d7b2410ea6b07a71c (diff)
parenteacf998af2bccc1020fb0ef2a2d1af4a0df41294 (diff)
downloadphp-git-3ae9399e400e07c5ade6f39f9419b2ad598c3e74.tar.gz
Merge branch 'PHP-5.6'
Conflicts: Zend/zend_execute_API.c
Diffstat (limited to 'Zend/tests')
-rw-r--r--Zend/tests/bug68370.phpt18
1 files changed, 18 insertions, 0 deletions
diff --git a/Zend/tests/bug68370.phpt b/Zend/tests/bug68370.phpt
new file mode 100644
index 0000000000..25589bf455
--- /dev/null
+++ b/Zend/tests/bug68370.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Bug #68370 "unset($this)" can make the program crash
+--FILE--
+<?php
+class C {
+ public function test() {
+ unset($this);
+ return get_defined_vars();
+ }
+}
+$c = new C();
+$x = $c->test();
+print_r($x);
+unset($c, $x);
+--EXPECTF--
+Array
+(
+)