summaryrefslogtreecommitdiff
path: root/ext/wddx/wddx.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/wddx/wddx.c')
-rw-r--r--ext/wddx/wddx.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index 662b957369..d58a564593 100644
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -907,8 +907,13 @@ static void php_wddx_pop_element(void *user_data, const XML_Char *name)
}
if (!strcmp((char *)name, EL_BINARY)) {
- zend_string *new_str = php_base64_decode(
- (unsigned char *)Z_STRVAL(ent1->data), Z_STRLEN(ent1->data));
+ zend_string *new_str = NULL;
+
+ if (ZSTR_EMPTY_ALLOC() != Z_STR(ent1->data)) {
+ new_str = php_base64_decode(
+ (unsigned char *)Z_STRVAL(ent1->data), Z_STRLEN(ent1->data));
+ }
+
zval_ptr_dtor(&ent1->data);
if (new_str) {
ZVAL_STR(&ent1->data, new_str);