fix wddx merge

diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index 539ed576624d4c5424978bbdf75d346be57bbff6..330cb49f08518656c17c7e4049b420a8c97aba58 100644 (file)
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -877,7 +877,7 @@ static void php_wddx_pop_element(void *user_data, const XML_Char *name)
                !strcmp((char *)name, EL_DATETIME)) {
                wddx_stack_top(stack, (void**)&ent1);
 
-               if (!ent1->data) {
+               if (Z_TYPE(ent1->data) == IS_UNDEF) {
                        if (stack->top > 1) {
                                stack->top--;
                        } else {
@@ -1020,7 +1020,7 @@ static void php_wddx_process_data(void *user_data, const XML_Char *s, int len)
                                        if (ent->varname) {
                                                efree(ent->varname);
                                        }
-                                       ent->data = NULL;
+                                       ZVAL_UNDEF(&ent->data);
                                }
                                break;