1 files changed, 9 insertions, 9 deletions

diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index 4e55c715e1..d364115799 100644
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -63,7 +63,7 @@
 #define EL_DATETIME				"dateTime"
 
 #define php_wddx_deserialize(a,b) \
-	php_wddx_deserialize_ex((a)->value.str.val, (a)->value.str.len, (b))
+	php_wddx_deserialize_ex(Z_STRVAL_P(a), Z_STRLEN_P(a), (b))
 
 #define SET_STACK_VARNAME							\
 		if (stack->varname) {						\
@@ -394,7 +394,7 @@ static void php_wddx_serialize_string(wddx_packet *packet, zval *var)
 
 		buf = php_escape_html_entities(Z_STRVAL_P(var), Z_STRLEN_P(var), 0, ENT_QUOTES, NULL);
 
-		php_wddx_add_chunk_ex(packet, buf->val, buf->len);
+		php_wddx_add_chunk_ex(packet, ZSTR_VAL(buf), ZSTR_LEN(buf));
 
 		zend_string_release(buf);
 	}
@@ -408,7 +408,7 @@ static void php_wddx_serialize_number(wddx_packet *packet, zval *var)
 {
 	char tmp_buf[WDDX_BUF_LEN];
 	zend_string *str = zval_get_string(var);
-	snprintf(tmp_buf, sizeof(tmp_buf), WDDX_NUMBER, str->val);
+	snprintf(tmp_buf, sizeof(tmp_buf), WDDX_NUMBER, ZSTR_VAL(str));
 	zend_string_release(str);
 
 	php_wddx_add_chunk(packet, tmp_buf);
@@ -458,7 +458,7 @@ static void php_wddx_serialize_object(wddx_packet *packet, zval *obj)
 			snprintf(tmp_buf, WDDX_BUF_LEN, WDDX_VAR_S, PHP_CLASS_NAME_VAR);
 			php_wddx_add_chunk(packet, tmp_buf);
 			php_wddx_add_chunk_static(packet, WDDX_STRING_S);
-			php_wddx_add_chunk_ex(packet, class_name->val, class_name->len);
+			php_wddx_add_chunk_ex(packet, ZSTR_VAL(class_name), ZSTR_LEN(class_name));
 			php_wddx_add_chunk_static(packet, WDDX_STRING_E);
 			php_wddx_add_chunk_static(packet, WDDX_VAR_E);
 
@@ -488,7 +488,7 @@ static void php_wddx_serialize_object(wddx_packet *packet, zval *obj)
 		snprintf(tmp_buf, WDDX_BUF_LEN, WDDX_VAR_S, PHP_CLASS_NAME_VAR);
 		php_wddx_add_chunk(packet, tmp_buf);
 		php_wddx_add_chunk_static(packet, WDDX_STRING_S);
-		php_wddx_add_chunk_ex(packet, class_name->val, class_name->len);
+		php_wddx_add_chunk_ex(packet, ZSTR_VAL(class_name), ZSTR_LEN(class_name));
 		php_wddx_add_chunk_static(packet, WDDX_STRING_E);
 		php_wddx_add_chunk_static(packet, WDDX_VAR_E);
 
@@ -591,9 +591,9 @@ void php_wddx_serialize_var(wddx_packet *packet, zval *var, zend_string *name)
 		char *tmp_buf;
 		zend_string *name_esc;
 
-		name_esc = php_escape_html_entities(name->val, name->len, 0, ENT_QUOTES, NULL);
-		tmp_buf = emalloc(name_esc->len + sizeof(WDDX_VAR_S));
-		snprintf(tmp_buf, name_esc->len + sizeof(WDDX_VAR_S), WDDX_VAR_S, name_esc->val);
+		name_esc = php_escape_html_entities(ZSTR_VAL(name), ZSTR_LEN(name), 0, ENT_QUOTES, NULL);
+		tmp_buf = emalloc(ZSTR_LEN(name_esc) + sizeof(WDDX_VAR_S));
+		snprintf(tmp_buf, ZSTR_LEN(name_esc) + sizeof(WDDX_VAR_S), WDDX_VAR_S, ZSTR_VAL(name_esc));
 		php_wddx_add_chunk(packet, tmp_buf);
 		efree(tmp_buf);
 		zend_string_release(name_esc);
@@ -1266,7 +1266,7 @@ PHP_FUNCTION(wddx_deserialize)
 		return;
 	}
 
-	php_wddx_deserialize_ex(payload->val, payload->len, return_value);
+	php_wddx_deserialize_ex(ZSTR_VAL(payload), ZSTR_LEN(payload), return_value);
 
 	if (stream) {
 		efree(payload);