Browse Source

- Fixed bug #50481 (Storing many SPLFixedArray in an array crashes)

pull/12/head
Felipe Pena 16 years ago
parent
commit
904b9282fe
  1. 1
      NEWS
  2. 3
      ext/spl/spl_fixedarray.c

1
NEWS

@ -16,6 +16,7 @@ PHP NEWS
- Fixed bug #51610 (Using oci_connect causes PHP to take a long time to
exit). Requires Oracle bug fix 9891199 for this patch to have an
effect. (Oracle Corp.)
- Fixed bug #50481 (Storing many SPLFixedArray in an array crashes). (Felipe)
22 Jul 2010, PHP 5.3.3
- Upgraded bundled sqlite to version 3.6.23.1. (Ilia)

3
ext/spl/spl_fixedarray.c

@ -158,6 +158,9 @@ static HashTable* spl_fixedarray_object_get_properties(zval *obj TSRMLS_DC) /* {
zend_hash_index_update(intern->std.properties, 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(intern->std.properties, i, (void *)&EG(uninitialized_zval_ptr), sizeof(zval *), NULL);
Z_ADDREF_P(EG(uninitialized_zval_ptr));
}

Loading…
Cancel
Save