laruence                                 Sat, 25 Feb 2012 05:18:40 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=323490

Log:
merge test to 5.3, and remove xfail since the bug was fixed

Changed paths:
    A   php/php-src/branches/PHP_5_3/Zend/tests/bug61165.phpt
    U   php/php-src/trunk/Zend/tests/bug61165.phpt

Added: php/php-src/branches/PHP_5_3/Zend/tests/bug61165.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/tests/bug61165.phpt                       
        (rev 0)
+++ php/php-src/branches/PHP_5_3/Zend/tests/bug61165.phpt       2012-02-25 
05:18:40 UTC (rev 323490)
@@ -0,0 +1,28 @@
+--TEST--
+Bug #61165 (Segfault - strip_tags())
+--FILE--
+<?php
+
+$handler = NULL;
+class T {
+    public $_this;
+
+    public function __toString() {
+               global $handler;
+           $handler = $this;
+        $this->_this = $this; // <-- uncoment this
+        return 'A';
+    }
+}
+
+$t = new T;
+for ($i = 0; $i < 3; $i++) {
+    strip_tags($t);
+       strip_tags(new T);
+}
+var_dump($handler);
+--EXPECTF--
+object(T)#%d (1) {
+  ["_this"]=>
+  *RECURSION*
+}

Modified: php/php-src/trunk/Zend/tests/bug61165.phpt
===================================================================
--- php/php-src/trunk/Zend/tests/bug61165.phpt  2012-02-25 04:36:08 UTC (rev 
323489)
+++ php/php-src/trunk/Zend/tests/bug61165.phpt  2012-02-25 05:18:40 UTC (rev 
323490)
@@ -1,7 +1,5 @@
 --TEST--
 Bug #61165 (Segfault - strip_tags())
---XFAIL--
-#61165 doesn't fix yet
 --FILE--
 <?php


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to