mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-28 04:14:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed nested GC calls (valgrind error in Zend/tests/gc_016.phpt)

Browse Source
This commit is contained in:
Dmitry Stogov 2014-04-14 22:41:42 +04:00
parent 703c1bc570
commit b0b54e8db4
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Zend/zend_gc.c
View File

@ -612,6 +612,7 @@ ZEND_API int gc_collect_cycles(TSRMLS_D)
if (GC_G(roots).next != &GC_G(roots)) {
gc_root_buffer *current, *orig_next_to_free;
zend_refcounted *p;
gc_root_buffer to_free;
if (GC_G(gc_active)) {
return 0;
@ -621,13 +622,28 @@ ZEND_API int gc_collect_cycles(TSRMLS_D)
gc_mark_roots(TSRMLS_C);
gc_scan_roots(TSRMLS_C);
count = gc_collect_roots(TSRMLS_C);
orig_next_to_free = GC_G(next_to_free);
GC_G(gc_active) = 0;
if (GC_G(to_free).next == &GC_G(to_free)) {
/* nothing to free */
return 0;
}
/* Copy global to_free list into local list */
to_free.next = GC_G(to_free).next;
to_free.prev = GC_G(to_free).prev;
to_free.next->prev = &to_free;
to_free.prev->next = &to_free;
/* Free global list */
GC_G(to_free).next = &GC_G(to_free);
GC_G(to_free).prev = &GC_G(to_free);
orig_next_to_free = GC_G(next_to_free);
/* First call destructors */
current = GC_G(to_free).next;
while (current != &GC_G(to_free)) {
current = to_free.next;
while (current != &to_free) {
p = current->ref;
GC_G(next_to_free) = current->next;
if (GC_TYPE(p) == IS_OBJECT) {
@ -649,8 +665,8 @@ ZEND_API int gc_collect_cycles(TSRMLS_D)
}
/* Destroy zvals */
current = GC_G(to_free).next;
while (current != &GC_G(to_free)) {
current = to_free.next;
while (current != &to_free) {
p = current->ref;
GC_G(next_to_free) = current->next;
if (GC_TYPE(p) == IS_OBJECT) {
@ -677,8 +693,8 @@ ZEND_API int gc_collect_cycles(TSRMLS_D)
}
/* Free objects */
current = GC_G(to_free).next;
while (current != &GC_G(to_free)) {
current = to_free.next;
while (current != &to_free) {
p = current->ref;
GC_G(next_to_free) = current->next;
if (GC_TYPE(p) == IS_OBJECT) {