Use 5.4 specifical warnnig & Update NEWs

diff --git a/NEWS b/NEWS
index 7960f65d9b09f0acb8ff153b80fda7f79dbc959e..951a96a44fda0b4ef9cecff02ebc89f61025e3d7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2013, PHP 5.4.15
 - Core:
+  . Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap: 
+       segfault). (Laruence)
   . Fixed bug #64433 (follow_location parameter of context is ignored for most 
     response codes). (Sergey Akbarov)
 

diff --git a/Zend/tests/bug64578.phpt b/Zend/tests/bug64578.phpt
index 65c51d94ffd16ca2364981260f86cf7837ec4e17..73b3ec4f970e44c6947cbb22ada3d52427e61353 100644 (file)
--- a/Zend/tests/bug64578.phpt
+++ b/Zend/tests/bug64578.phpt
@@ -2,14 +2,12 @@
 Bug #64578 (debug_backtrace in set_error_handler corrupts zend heap: segfault)
 --FILE--
 <?php
-function x($s) { 
-       $resource = fopen("php://input", "r"); 
-       $s[$resource] = '2';
-}
-$y = "1";
+
+set_error_handler(function() { debug_backtrace(); });
+
+function x($s) { $s['a'] = 1; };
+$y = '1';
 x($y);
-var_dump($y);
-?>
+print_r($y);
 --EXPECTF--
-Warning: Illegal offset type in %sbug64578.php on line %d
-string(1) "1"
+1