- Add some initializations

diff --git a/Zend/zend.c b/Zend/zend.c
index 4ae7bc0ead3240c29dd6bb5e6e3a5e9acdfe1667..a1563cd0fa67384236516e0401c832e3cf760594 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -252,6 +252,7 @@ static void register_standard_class(void)
        zend_standard_class_def.parent = NULL;
        zend_hash_init_ex(&zend_standard_class_def.default_properties, 0, NULL, ZVAL_PTR_DTOR, 1, 0);
        zend_hash_init_ex(&zend_standard_class_def.function_table, 0, NULL, ZEND_FUNCTION_DTOR, 1, 0);
+       zend_standard_class_def.constructor = NULL;
        zend_standard_class_def.handle_function_call = NULL;
        zend_standard_class_def.handle_property_get = NULL;
        zend_standard_class_def.handle_property_set = NULL;

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 3da2b158e5385d8bdb0fee59ddf93a9311a92a53..7fe243eafa6cd5e3ad71f612c9d1561f5121f048 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -87,6 +87,7 @@
                class_container.name = strdup(class_name);                                      \
                class_container.name_length = sizeof(class_name)-1;                     \
                class_container.builtin_functions = functions;                          \
+               class_container.constructor = NULL;                                                     \
                class_container.handle_function_call = NULL;                            \
                class_container.handle_property_get = NULL;                                     \
                class_container.handle_property_set = NULL;                                     \
@@ -97,6 +98,7 @@
                class_container.name = strdup(class_name);                              \
                class_container.name_length = sizeof(class_name)-1;             \
                class_container.builtin_functions = functions;                  \
+               class_container.constructor = NULL;                                             \
                class_container.handle_function_call = handle_fcall;    \
                class_container.handle_property_get = handle_propget;   \
                class_container.handle_property_set = handle_propset;   \

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 9d31e099ccaa6e084d88d6e6da29ddb16611b904..2185ed4fb7c547672264111b94c3eb25107650ad 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -1683,6 +1683,8 @@ void zend_do_begin_class_declaration(znode *class_token, znode *class_name, znod
        zend_hash_init(&new_class_entry.class_table, 10, NULL, ZEND_CLASS_DTOR, 0);
        zend_hash_init(&new_class_entry.default_properties, 10, NULL, ZVAL_PTR_DTOR, 0);
 
+       new_class_entry.constructor = NULL;
+
        new_class_entry.handle_function_call = NULL;
        new_class_entry.handle_property_set = NULL;
        new_class_entry.handle_property_get = NULL;