Skip to content

Commit 1ce0ea7

Browse files
committed
fix wddx merge
1 parent 6823ee9 commit 1ce0ea7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ext/wddx/wddx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -877,7 +877,7 @@ static void php_wddx_pop_element(void *user_data, const XML_Char *name)
877877
!strcmp((char *)name, EL_DATETIME)) {
878878
wddx_stack_top(stack, (void**)&ent1);
879879

880-
if (!ent1->data) {
880+
if (Z_TYPE(ent1->data) == IS_UNDEF) {
881881
if (stack->top > 1) {
882882
stack->top--;
883883
} else {
@@ -1020,7 +1020,7 @@ static void php_wddx_process_data(void *user_data, const XML_Char *s, int len)
10201020
if (ent->varname) {
10211021
efree(ent->varname);
10221022
}
1023-
ent->data = NULL;
1023+
ZVAL_UNDEF(&ent->data);
10241024
}
10251025
break;
10261026

0 commit comments

Comments
 (0)