(php_wddx_deserialize_ex) return SUCCESS/FAILURE

Use that return value in WDDX session deserializer.

1 files changed, 20 insertions, 27 deletions

diff --git a/ext/session/session.c b/ext/session/session.c
index 3efca14f1a..cc0096bf42 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -336,42 +336,35 @@ PS_SERIALIZER_DECODE_FUNC(wddx)
 	ulong idx;
 	int hash_type;
 	int dofree = 1;
-	int ret = SUCCESS;
+	int ret;
 
 	if (vallen == 0) 
 		return SUCCESS;
 	
 	MAKE_STD_ZVAL(retval);
 
-	retval->type = IS_NULL;
-
-	php_wddx_deserialize_ex((char *)val, vallen, retval);
-
-	if (retval->type == IS_NULL) {
-		ret = FAILURE;
-		goto cleanup;
-	}
-
-	for (zend_hash_internal_pointer_reset(retval->value.ht);
-			zend_hash_get_current_data(retval->value.ht, (void **) &ent) == SUCCESS;
-			zend_hash_move_forward(retval->value.ht)) {
-		hash_type = zend_hash_get_current_key(retval->value.ht, &key, &idx);
-
-		switch (hash_type) {
-			case HASH_KEY_IS_LONG:
-				sprintf(tmp, "%ld", idx);
-				key = tmp;
-				dofree = 0;
-				/* fallthru */
-			case HASH_KEY_IS_STRING:
-				php_set_session_var(key, strlen(key), *ent PSLS_CC);
-				PS_ADD_VAR(key);
-				if (dofree) efree(key);
-				dofree = 1;
+	if ((ret = php_wddx_deserialize_ex((char *)val, vallen, retval)) == SUCCESS) {
+
+		for (zend_hash_internal_pointer_reset(retval->value.ht);
+			 zend_hash_get_current_data(retval->value.ht, (void **) &ent) == SUCCESS;
+			 zend_hash_move_forward(retval->value.ht)) {
+			hash_type = zend_hash_get_current_key(retval->value.ht, &key, &idx);
+
+			switch (hash_type) {
+				case HASH_KEY_IS_LONG:
+					sprintf(tmp, "%ld", idx);
+					key = tmp;
+					dofree = 0;
+					/* fallthru */
+				case HASH_KEY_IS_STRING:
+					php_set_session_var(key, strlen(key), *ent PSLS_CC);
+					PS_ADD_VAR(key);
+					if (dofree) efree(key);
+					dofree = 1;
+			}
 		}
 	}
 
-cleanup:
 	zval_dtor(retval);
 	efree(retval);