com php-src: Fix wddx: ext/wddx/wddx.c
| From: | Anatol Belski | Date: | Wed, 05 Jul 2017 08:11:12 +0000 |
| Subject: | com php-src: Fix wddx: ext/wddx/wddx.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98370@lists.php.net to get a copy of this message | ||
Commit: 203a9a61a2db48eeb2411fae41b7ebe07d3eea2c
Author: Stanislav Malyshev <stas@php.net> Tue, 4 Jul 2017 20:18:57 -0700
Committer: Anatol Belski <ab@php.net> Wed, 5 Jul 2017 10:11:12 +0200
Parents: 448b8d573fd7fb1d2b8890890c92da162755abad
Branches: PHP-7.0.21
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=203a9a61a2db48eeb2411fae41b7ebe07d3eea2c
Log:
Fix wddx
(cherry picked from commit 6b18d956de38ecd8913c3d82ce96eb0368a1f9e5)
Changed paths:
M ext/wddx/wddx.c
Diff:
diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index b79d0fb..feb6333 100644
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -758,9 +758,6 @@ static void php_wddx_push_element(void *user_data, const XML_Char *name, const X
} else if (!strcmp((char *)name, EL_BOOLEAN)) {
int i;
- ALLOC_ZVAL(ent.data);
- INIT_PZVAL(ent.data);
- Z_TYPE_P(ent.data) = IS_BOOL;
ent.type = ST_BOOLEAN;
SET_STACK_VARNAME;
if (atts) for (i = 0; atts[i]; i++) {
@@ -771,7 +768,7 @@ static void php_wddx_push_element(void *user_data, const XML_Char *name, const X
break;
}
} else {
- ZVAL_FALSE(ent.data);
+ ZVAL_FALSE(&ent.data);
wddx_stack_push((wddx_stack *)stack, &ent, sizeof(st_entry));
}
} else if (!strcmp((char *)name, EL_NULL)) {