- Fix copy&paste problem where we allocated according to an old structure

- decleration and not the new one.

diff --git a/Zend/zend_objects.h b/Zend/zend_objects.h
index f173e1195d9b4c759129ee8884e204b53c4e096a..22cfaf7ee5fee42b4b7cc25e357a939688248da3 100644 (file)
--- a/Zend/zend_objects.h
+++ b/Zend/zend_objects.h
@@ -3,27 +3,6 @@
 
 #include "zend.h"
 
-typedef struct _zend_object_bucket {
-       zend_bool valid;
-       zend_bool destructor_called;
-       union _bucket {
-               struct {
-                       zend_object object;
-                       zend_uint refcount;
-               } obj;
-               struct {
-                       int next;
-               } free_list;
-       } bucket;
-} zend_object_bucket;
-
-typedef struct _zend_objects {
-       zend_object_bucket *object_buckets;
-       zend_uint top;
-       zend_uint size;
-       int free_list_head;
-} zend_objects;
-
 zend_object_value zend_objects_new(zend_object **object, zend_class_entry *class_type);
 zend_object *zend_objects_get_address(zval *object);
 zend_object_value zend_objects_clone_obj(zval *object TSRMLS_DC);

diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c
index 09108cb8c8c3ec155d21d3a002e64d96bed3d004..e37e827486fc24b854689e2795c91b46589a4f79 100644 (file)
--- a/Zend/zend_objects_API.c
+++ b/Zend/zend_objects_API.c
@@ -8,7 +8,7 @@
 
 void zend_objects_store_init(zend_objects_store *objects, zend_uint init_size)
 {
-       objects->object_buckets = (zend_object_store_bucket *) emalloc(init_size * sizeof(zend_object_bucket));
+       objects->object_buckets = (zend_object_store_bucket *) emalloc(init_size * sizeof(zend_object_store_bucket));
        objects->top = 1; /* Skip 0 so that handles are true */
        objects->size = init_size;
        objects->free_list_head = -1;