From 84bc1c8593861e6027488dd71de0ed7d7a4af172 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Sun, 8 Aug 2010 23:56:29 +0000 Subject: [PATCH] - Fixed bug #50481 (Storing many SPLFixedArray in an array crashes) --- ext/spl/spl_fixedarray.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c index 73f5fcbd01d..4389d505b31 100644 --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@ -159,6 +159,9 @@ static HashTable* spl_fixedarray_object_get_properties(zval *obj TSRMLS_DC) /* { zend_hash_index_update(ht, i, (void *)&intern->array->elements[i], sizeof(zval *), NULL); Z_ADDREF_P(intern->array->elements[i]); } else { + if (GC_G(gc_active)) { + return NULL; + } zend_hash_index_update(ht, i, (void *)&EG(uninitialized_zval_ptr), sizeof(zval *), NULL); Z_ADDREF_P(EG(uninitialized_zval_ptr)); }