summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2016-03-02 00:02:33 -0800
committerStanislav Malyshev <stas@php.net>2016-03-02 00:02:58 -0800
commite09845d32614a19188632f410316478fbb440ebd (patch)
tree608db8c4ca3b0e5b1eea415966ad587b4854d15d
parentc69d80d701f1127b2360133f053a2f10e85f9263 (diff)
downloadphp-git-PHP-7.0.4.tar.gz
fix wddx mergephp-7.0.4PHP-7.0.4
-rw-r--r--ext/wddx/wddx.c4
1 files 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;