Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

- Fixed bug #51445 (var_dump() invalid/slow *RECURSION* detection)

pull/12/head
Felipe Pena 16 years ago
parent
0758c8794d
commit
a140e70661
23 changed files with 61 additions and 314 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      NEWS
  2. 18
      Zend/tests/bug35163.phpt
  3. 37
      Zend/tests/bug35163_2.phpt
  4. 22
      Zend/tests/bug35163_3.phpt
  5. 24
      Zend/tests/bug35239.phpt
  6. 13
      Zend/tests/closure_020.phpt
  7. 10
      Zend/tests/closure_034.phpt
  8. 10
      Zend/tests/closure_035.phpt
  9. 5
      Zend/tests/foreach_002.phpt
  10. 5
      Zend/tests/gc_004.phpt
  11. 9
      Zend/tests/gc_005.phpt
  12. 12
      Zend/tests/gc_006.phpt
  13. 5
      Zend/tests/gc_007.phpt
  14. 9
      Zend/tests/gc_008.phpt
  15. 12
      Zend/tests/gc_009.phpt
  16. 5
      Zend/tests/gc_010.phpt
  17. 9
      Zend/tests/gc_011.phpt
  18. 14
      Zend/tests/objects_020.phpt
  19. 77
      ext/standard/tests/array/array_map_variation2.phpt
  20. 23
      ext/standard/tests/array/array_push_variation4.phpt
  21. 20
      ext/standard/tests/array/array_values_variation4.phpt
  22. 28
      ext/standard/tests/array/natcasesort_variation7.phpt
  23. 7
      ext/standard/var.c

1
NEWS
View File

@ -11,6 +11,7 @@ PHP NEWS
- Fixed a NULL pointer dereference when processing invalid XML-RPC
requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert)
- Fixed bug #51445 (var_dump() invalid/slow *RECURSION* detection). (Felipe)
- Fixed bug #51394 (Error line reported incorrectly if error handler throws an
exception). (Stas)
- Fixed bug #51393 (DateTime::createFromFormat() fails if format string contains

18
Zend/tests/bug35163.phpt
View File

@ -17,22 +17,8 @@ array(1) {
[0]=>
int(2)
[1]=>
&array(3) {
[0]=>
int(2)
[1]=>
*RECURSION*
[2]=>
*RECURSION*
}
*RECURSION*
[2]=>
&array(3) {
[0]=>
int(2)
[1]=>
*RECURSION*
[2]=>
*RECURSION*
}
*RECURSION*
}
}

37
Zend/tests/bug35163_2.phpt
View File

@ -20,46 +20,17 @@ array(3) {
[0]=>
int(2)
[1]=>
&array(3) {
[0]=>
int(2)
[1]=>
*RECURSION*
[2]=>
*RECURSION*
}
*RECURSION*
[2]=>
&array(3) {
[0]=>
int(2)
[1]=>
*RECURSION*
[2]=>
*RECURSION*
}
*RECURSION*
}
[2]=>
&array(3) {
[0]=>
int(2)
[1]=>
&array(3) {
[0]=>
int(2)
[1]=>
*RECURSION*
[2]=>
*RECURSION*
}
*RECURSION*
[2]=>
&array(3) {
[0]=>
int(2)
[1]=>
*RECURSION*
[2]=>
*RECURSION*
}
*RECURSION*
}
}

22
Zend/tests/bug35163_3.phpt
View File

@ -11,29 +11,15 @@ var_dump($a);
$a->b = null;
$a = null;
?>
--EXPECT--
object(stdClass)#1 (1) {
--EXPECTF--
object(stdClass)#%d (1) {
["b"]=>
&array(3) {
[0]=>
int(2)
[1]=>
&array(3) {
[0]=>
int(2)
[1]=>
*RECURSION*
[2]=>
*RECURSION*
}
*RECURSION*
[2]=>
&array(3) {
[0]=>
int(2)
[1]=>
*RECURSION*
[2]=>
*RECURSION*
}
*RECURSION*
}
}

24
Zend/tests/bug35239.phpt
View File

@ -12,30 +12,16 @@ var_dump($a);
$a->x0->y1 = "ok\n";
echo $a->x0;
?>
--EXPECT--
object(stdClass)#1 (1) {
--EXPECTF--
object(stdClass)#%d (1) {
["x0"]=>
&object(stdClass)#2 (3) {
&object(stdClass)#%d (3) {
["y0"]=>
string(1) "b"
["y1"]=>
&object(stdClass)#2 (3) {
["y0"]=>
string(1) "b"
["y1"]=>
*RECURSION*
["y2"]=>
*RECURSION*
}
*RECURSION*
["y2"]=>
&object(stdClass)#2 (3) {
["y0"]=>
string(1) "b"
["y1"]=>
*RECURSION*
["y2"]=>
*RECURSION*
}
*RECURSION*
}
}
ok

13
Zend/tests/closure_020.phpt
View File

@ -31,18 +31,7 @@ object(foo)#%d (%d) {
["static"]=>
array(1) {
["a"]=>
&object(foo)#%d (2) {
["test":"foo":private]=>
int(3)
["a"]=>
object(Closure)#%d (1) {
["static"]=>
array(1) {
["a"]=>
*RECURSION*
}
}
}
*RECURSION*
}
}
}

10
Zend/tests/closure_034.phpt
View File

@ -9,17 +9,11 @@ var_dump($a);
?>
===DONE===
--EXPECTF--
object(Closure)#1 (1) {
object(Closure)#%d (1) {
["static"]=>
array(1) {
["a"]=>
&object(Closure)#1 (1) {
["static"]=>
array(1) {
["a"]=>
*RECURSION*
}
}
*RECURSION*
}
}
===DONE===

10
Zend/tests/closure_035.phpt
View File

@ -18,14 +18,8 @@ var_dump($x());
object(Closure)#%d (1) {
["static"]=>
array(1) {
[%u|b%"x"]=>
&object(Closure)#%d (1) {
["static"]=>
array(1) {
[%u|b%"x"]=>
*RECURSION*
}
}
["x"]=>
*RECURSION*
}
}
int(1)

5
Zend/tests/foreach_002.phpt
View File

@ -15,9 +15,6 @@ array(1) {
["a"]=>
&array(1) {
["a"]=>
&array(1) {
["a"]=>
*RECURSION*
}
*RECURSION*
}
}

5
Zend/tests/gc_004.phpt
View File

@ -16,10 +16,7 @@ array(1) {
[0]=>
&array(1) {
[0]=>
&array(1) {
[0]=>
*RECURSION*
}
*RECURSION*
}
}
int(1)

9
Zend/tests/gc_005.phpt
View File

@ -11,13 +11,10 @@ unset($a);
var_dump(gc_collect_cycles());
echo "ok\n"
?>
--EXPECT--
object(stdClass)#1 (1) {
--EXPECTF--
object(stdClass)#%d (1) {
["a"]=>
object(stdClass)#1 (1) {
["a"]=>
*RECURSION*
}
*RECURSION*
}
int(1)
ok

12
Zend/tests/gc_006.phpt
View File

@ -12,18 +12,12 @@ unset($a);
var_dump(gc_collect_cycles());
echo "ok\n"
?>
--EXPECT--
object(stdClass)#1 (1) {
--EXPECTF--
object(stdClass)#%d (1) {
["a"]=>
array(1) {
[0]=>
&object(stdClass)#1 (1) {
["a"]=>
array(1) {
[0]=>
*RECURSION*
}
}
*RECURSION*
}
}
int(2)

5
Zend/tests/gc_007.phpt
View File

@ -17,10 +17,7 @@ array(1) {
[0]=>
&array(1) {
[0]=>
&array(1) {
[0]=>
*RECURSION*
}
*RECURSION*
}
}
int(0)

9
Zend/tests/gc_008.phpt
View File

@ -13,13 +13,10 @@ unset($a);
var_dump(gc_collect_cycles());
echo "ok\n"
?>
--EXPECT--
object(stdClass)#2 (1) {
--EXPECTF--
object(stdClass)#%d (1) {
["a"]=>
object(stdClass)#2 (1) {
["a"]=>
*RECURSION*
}
*RECURSION*
}
int(0)
int(1)

12
Zend/tests/gc_009.phpt
View File

@ -14,18 +14,12 @@ unset($a);
var_dump(gc_collect_cycles());
echo "ok\n"
?>
--EXPECT--
object(stdClass)#1 (1) {
--EXPECTF--
object(stdClass)#%d (1) {
["a"]=>
array(1) {
[0]=>
&object(stdClass)#1 (1) {
["a"]=>
array(1) {
[0]=>
*RECURSION*
}
}
*RECURSION*
}
}
int(0)

5
Zend/tests/gc_010.phpt
View File

@ -17,10 +17,7 @@ array(1) {
[0]=>
&array(1) {
[0]=>
&array(1) {
[0]=>
*RECURSION*
}
*RECURSION*
}
}
int(1)

9
Zend/tests/gc_011.phpt
View File

@ -17,13 +17,10 @@ unset($a);
var_dump(gc_collect_cycles());
echo "ok\n"
?>
--EXPECT--
object(Foo)#1 (1) {
--EXPECTF--
object(Foo)#%d (1) {
["a"]=>
object(Foo)#1 (1) {
["a"]=>
*RECURSION*
}
*RECURSION*
}
__destruct
int(1)

14
Zend/tests/objects_020.phpt
View File

@ -13,18 +13,10 @@ $$test->a->b[] = 2;
var_dump($$test);
?>
--EXPECT--
object(stdClass)#1 (2) {
--EXPECTF--
object(stdClass)#%d (2) {
["a"]=>
&object(stdClass)#1 (2) {
["a"]=>
*RECURSION*
["b"]=>
array(1) {
[0]=>
int(2)
}
}
*RECURSION*
["b"]=>
array(1) {
[0]=>

77
ext/standard/tests/array/array_map_variation2.phpt
View File

@ -47,16 +47,7 @@ array(4) {
[0]=>
&string(2) "v1"
[1]=>
&array(4) {
["k1"]=>
&string(2) "v1"
["k2"]=>
string(2) "v2"
[0]=>
&string(2) "v1"
[1]=>
*RECURSION*
}
*RECURSION*
}
}
array(4) {
@ -94,16 +85,7 @@ array(4) {
[0]=>
&string(2) "v1"
[1]=>
&array(4) {
["k1"]=>
&string(2) "v1"
["k2"]=>
string(2) "v2"
[0]=>
&string(2) "v1"
[1]=>
*RECURSION*
}
*RECURSION*
}
}
}
@ -127,16 +109,7 @@ array(4) {
[0]=>
&string(2) "v1"
[1]=>
&array(4) {
["k1"]=>
&string(2) "v1"
["k2"]=>
string(2) "v2"
[0]=>
&string(2) "v1"
[1]=>
*RECURSION*
}
*RECURSION*
}
}
array(4) {
@ -166,16 +139,7 @@ array(4) {
[0]=>
&string(2) "v1"
[1]=>
&array(4) {
["k1"]=>
&string(2) "v1"
["k2"]=>
string(2) "v2"
[0]=>
&string(2) "v1"
[1]=>
*RECURSION*
}
*RECURSION*
}
}
}
@ -195,16 +159,7 @@ array(4) {
[0]=>
&string(2) "v1"
[1]=>
&array(4) {
["k1"]=>
&string(2) "v1"
["k2"]=>
string(2) "v2"
[0]=>
&string(2) "v1"
[1]=>
*RECURSION*
}
*RECURSION*
}
}
array(4) {
@ -240,16 +195,7 @@ array(4) {
[0]=>
&string(2) "v1"
[1]=>
&array(4) {
["k1"]=>
&string(2) "v1"
["k2"]=>
string(2) "v2"
[0]=>
&string(2) "v1"
[1]=>
*RECURSION*
}
*RECURSION*
}
[1]=>
&array(4) {
@ -260,16 +206,7 @@ array(4) {
[0]=>
&string(2) "v1"
[1]=>
&array(4) {
["k1"]=>
&string(2) "v1"
["k2"]=>
string(2) "v2"
[0]=>
&string(2) "v1"
[1]=>
*RECURSION*
}
*RECURSION*
}
}
}

23
ext/standard/tests/array/array_push_variation4.phpt
View File

@ -104,28 +104,7 @@ array(10) {
[8]=>
&string(1) "z"
[9]=>
&array(10) {
[0]=>
int(1)
[1]=>
int(2)
[2]=>
int(3)
[3]=>
&string(1) "a"
[4]=>
&string(1) "b"
[5]=>
&string(1) "c"
[6]=>
&string(1) "x"
[7]=>
&string(1) "y"
[8]=>
&string(1) "z"
[9]=>
*RECURSION*
}
*RECURSION*
}
}
Done

20
ext/standard/tests/array/array_values_variation4.phpt
View File

@ -93,23 +93,7 @@ array(4) {
int(3)
}
[0]=>
&array(4) {
["zero"]=>
string(4) "zero"
["un"]=>
string(3) "one"
["sub"]=>
array(3) {
[0]=>
int(1)
[1]=>
int(2)
[2]=>
int(3)
}
[0]=>
*RECURSION*
}
*RECURSION*
}
}
Done
Done

28
ext/standard/tests/array/natcasesort_variation7.phpt
View File

@ -44,18 +44,7 @@ array(5) {
[3]=>
string(1) "2"
[4]=>
&array(5) {
[0]=>
int(1)
[1]=>
float(3)
[2]=>
string(4) "zero"
[3]=>
string(1) "2"
[4]=>
*RECURSION*
}
*RECURSION*
}
}
bool(true)
@ -75,22 +64,11 @@ array(5) {
[1]=>
float(3)
[4]=>
&array(5) {
[0]=>
int(1)
[3]=>
string(1) "2"
[1]=>
float(3)
[4]=>
*RECURSION*
[2]=>
string(4) "zero"
}
*RECURSION*
[2]=>
string(4) "zero"
}
[2]=>
string(4) "zero"
}
Done
Done

7
ext/standard/var.c
View File

@ -116,8 +116,9 @@ PHPAPI void php_var_dump(zval **struc, int level TSRMLS_DC) /* {{{ */
break;
case IS_ARRAY:
myht = Z_ARRVAL_PP(struc);
if (myht->nApplyCount > 1) {
if (++myht->nApplyCount > 1) {
PUTS("*RECURSION*\n");
--myht->nApplyCount;
return;
}
php_printf("%sarray(%d) {\n", COMMON, zend_hash_num_elements(myht));
@ -126,8 +127,9 @@ PHPAPI void php_var_dump(zval **struc, int level TSRMLS_DC) /* {{{ */
goto head_done;
case IS_OBJECT:
myht = Z_OBJDEBUG_PP(struc, is_temp);
if (myht && myht->nApplyCount > 1) {
if (myht && ++myht->nApplyCount > 1) {
PUTS("*RECURSION*\n");
--myht->nApplyCount;
return;
}
@ -138,6 +140,7 @@ PHPAPI void php_var_dump(zval **struc, int level TSRMLS_DC) /* {{{ */
head_done:
if (myht) {
zend_hash_apply_with_arguments(myht TSRMLS_CC, (apply_func_args_t) php_element_dump_func, 1, level);
--myht->nApplyCount;
if (is_temp) {
zend_hash_destroy(myht);
efree(myht);

Write Preview
Loading…
Cancel
Save