From 1ce0ea7396a917f3e68037df3647c4118f3a9fec Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Wed, 2 Mar 2016 00:02:33 -0800 Subject: [PATCH] fix wddx merge --- ext/wddx/wddx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c index 539ed57662..330cb49f08 100644 --- 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; -- 2.40.0