Fixed bug #63680 (Memleak in splfixedarray with cycle reference)

diff --git a/NEWS b/NEWS
index 4629c41496f684d9c726b40f9d51d9459dd9ab00..2023198d19af98cf7ef787dc63d90975c8699356 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -60,6 +60,9 @@ PHP                                                                        NEWS
   . Fixed bug #49341 (Add SO_REUSEPORT support for socket_set_option()).
     (Igor Wiedler, Lars)
 
+- SPL
+  . Fixed bug #63680 (Memleak in splfixedarray with cycle reference). (Laruence)
+
 22 Nov 2012, PHP 5.4.9
 
 - Core:

diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c
index 244bd3e0df2bc00f1303823bdc1dde4dfab00bbc..6a4d7858f3f7884aa1f921c47c969ade067c97b6 100644 (file)
--- a/ext/spl/spl_fixedarray.c
+++ b/ext/spl/spl_fixedarray.c
@@ -147,13 +147,30 @@ static void spl_fixedarray_copy(spl_fixedarray *to, spl_fixedarray *from TSRMLS_
 }
 /* }}} */
 
+static HashTable* spl_fixedarray_object_get_gc(zval *obj, zval ***table, int *n TSRMLS_DC) /* {{{{ */
+{
+       spl_fixedarray_object *intern  = (spl_fixedarray_object*)zend_object_store_get_object(obj TSRMLS_CC);
+       HashTable *ht = zend_std_get_properties(obj TSRMLS_CC);
+
+       if (intern->array) {
+               *table = intern->array->elements;
+               *n = intern->array->size;
+       } else {
+               *table = NULL;
+               *n = 0;
+       }
+
+       return ht;
+}
+/* }}}} */
+
 static HashTable* spl_fixedarray_object_get_properties(zval *obj TSRMLS_DC) /* {{{{ */
 {
        spl_fixedarray_object *intern  = (spl_fixedarray_object*)zend_object_store_get_object(obj TSRMLS_CC);
        HashTable *ht = zend_std_get_properties(obj TSRMLS_CC);
        int  i = 0;
 
-       if (intern->array && !GC_G(gc_active)) {
+       if (intern->array) {
                int j = zend_hash_num_elements(ht);
 
                for (i = 0; i < intern->array->size; i++) {
@@ -1091,6 +1108,7 @@ PHP_MINIT_FUNCTION(spl_fixedarray)
        spl_handler_SplFixedArray.has_dimension   = spl_fixedarray_object_has_dimension;
        spl_handler_SplFixedArray.count_elements  = spl_fixedarray_object_count_elements;
        spl_handler_SplFixedArray.get_properties  = spl_fixedarray_object_get_properties;
+       spl_handler_SplFixedArray.get_gc          = spl_fixedarray_object_get_gc;
 
        REGISTER_SPL_IMPLEMENTS(SplFixedArray, Iterator);
        REGISTER_SPL_IMPLEMENTS(SplFixedArray, ArrayAccess);

diff --git a/ext/spl/tests/bug63680.phpt b/ext/spl/tests/bug63680.phpt
new file mode 100644 (file)
index 0000000..3a20c4b
--- /dev/null
+++ b/ext/spl/tests/bug63680.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Bug #63680 (Memleak in splfixedarray with cycle reference)
+--FILE--
+<?php
+function dummy() {
+    $a = new SplFixedArray(1);
+    $b = new SplFixedArray(1);
+    $a[0] = $b;
+    $b[0] = $a;
+}
+
+dummy();
+var_dump(gc_collect_cycles());
+?>
+--EXPECT--
+int(2)