archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- Fixed bug #47341: Calling gc_collect_cycles() with zend.enable_gc=0 causes

Browse source 
segfault.
This commit is contained in:
Derick Rethans 2009-02-08 19:30:01 +00:00
parent 4164e522c6
commit 201c26283c
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Zend/tests/gc_031.phpt Normal file
View file

@ -0,0 +1,11 @@
--TEST--
GC 031: gc_collect_roots() with GC turned off.
--INI--
zend.enable_gc=0
--FILE--
<?php
gc_collect_cycles();
echo "DONE\n";
?>
--EXPECTF--
DONE

2
Zend/zend_gc.c
View file

@ -527,7 +527,7 @@ ZEND_API int gc_collect_cycles(TSRMLS_D)
{ {
int count = 0; int count = 0;
if (GC_G(roots).next != &GC_G(roots)) { if (GC_G(roots).next != &GC_G(roots) && GC_G(roots).next) {
zval_gc_info *p, *q, *orig_free_list, *orig_next_to_free; zval_gc_info *p, *q, *orig_free_list, *orig_next_to_free;
if (GC_G(gc_active)) { if (GC_G(gc_active)) {