Fix order of class_entry member initialization (needed for example for DOM)

# You need to completley rebuild PHP after this patch.

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 67818b860a9d4e0923e736c54a882ffe22f88909..aab1d359ff274689ffad5481eec74ff5b6168a07 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -127,7 +127,9 @@ typedef struct _zend_function_entry {
                class_container.__call = handle_fcall;  \
                class_container.__get = handle_propget; \
                class_container.__set = handle_propset; \
+               class_container.parent = NULL;          \
                class_container.num_interfaces = 0;     \
+               class_container.interfaces = NULL;      \
                class_container.get_iterator = NULL;    \
                class_container.iterator_funcs.funcs = NULL;  \
        }

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 16f320ef2524d0838c2c4bdd9e75d0e364430873..639ef3c6d84340cbba09759bd0c345df7820a5ca 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3565,14 +3565,13 @@ ZEND_API void zend_initialize_class_data(zend_class_entry *ce, zend_bool nullify
                ce->__set = NULL;
                ce->__call = NULL;
                ce->create_object = NULL;
+               ce->get_iterator = NULL;
+               ce->iterator_funcs.funcs = NULL;
+               ce->interface_gets_implemented = NULL;
+               ce->parent = NULL;
+               ce->num_interfaces = 0;
+               ce->interfaces = NULL;
        }
-
-       ce->parent = NULL;
-       ce->num_interfaces = 0;
-       ce->interfaces = NULL;
-       ce->get_iterator = NULL;
-       ce->iterator_funcs.funcs = NULL;
-       ce->interface_gets_implemented = NULL;
 }