Fixing tests(not finish yet)

Author: laruence

msgpack.c

@@ -166,7 +166,6 @@ PS_SERIALIZER_DECODE_FUNC(msgpack) /* {{{ */ {
     ret = template_execute(&mp, val, vallen, &off);
 
     if (ret == MSGPACK_UNPACK_EXTRA_BYTES || ret == MSGPACK_UNPACK_SUCCESS) {
-        msgpack_unserialize_set_return_value(&var_hash, &tmp);
         msgpack_unserialize_var_destroy(&var_hash, 0);
 
         ZEND_HASH_FOREACH_STR_KEY_VAL(HASH_OF(&tmp), key_str, value) {
@@ -224,15 +223,13 @@ PHP_MSGPACK_API void php_msgpack_unserialize(zval *return_value, char *str, size
             MSGPACK_WARNING("[msgpack] (%s) Parse error", __FUNCTION__);
             break;
         case MSGPACK_UNPACK_CONTINUE:
-            msgpack_unserialize_set_return_value(&var_hash, return_value);
-            msgpack_unserialize_var_destroy(&var_hash, 0);
+            msgpack_unserialize_var_destroy(&var_hash, 1);
             MSGPACK_WARNING(
                 "[msgpack] (%s) Insufficient data for unserializing",
                 __FUNCTION__);
             break;
         case MSGPACK_UNPACK_EXTRA_BYTES:
         case MSGPACK_UNPACK_SUCCESS:
-            msgpack_unserialize_set_return_value(&var_hash, return_value);
             msgpack_unserialize_var_destroy(&var_hash, 0);
             if (off < str_len) {
                 MSGPACK_WARNING("[msgpack] (%s) Extra bytes", __FUNCTION__);

msgpack_class.c

@@ -311,6 +311,7 @@ static ZEND_METHOD(msgpack_unpacker, __destruct) /* {{{ */ {
     php_msgpack_unpacker_t *unpacker = Z_MSGPACK_UNPACKER_P(getThis());
     smart_str_free(&unpacker->buffer);
     msgpack_unserialize_var_destroy(&unpacker->var_hash, unpacker->error);
+	zval_ptr_dtor(&unpacker->retval);
 }
 /* }}} */
 
@@ -388,7 +389,6 @@ static ZEND_METHOD(msgpack_unpacker, execute) /* {{{ */ {
 	}
 
     if (unpacker->finished) {
-        msgpack_unserialize_set_return_value(&unpacker->var_hash, &unpacker->retval);
         msgpack_unserialize_var_destroy(&unpacker->var_hash, unpacker->error);
         unpacker->error = 0;
 
@@ -438,20 +438,21 @@ static ZEND_METHOD(msgpack_unpacker, data) /* {{{ */ {
 	}
 
 	if (unpacker->finished) {
-		msgpack_unserialize_set_return_value(&unpacker->var_hash, &unpacker->retval);
-	}
-
-	if (object == NULL) {
-		ZVAL_COPY_VALUE(return_value, &unpacker->retval);
-	} else {
-		zval zv;
-		ZVAL_COPY_VALUE(&zv, &unpacker->retval);
-
-		if (msgpack_convert_object(return_value, object, &zv) != SUCCESS) {
+		if (object == NULL) {
+			ZVAL_COPY_VALUE(return_value, &unpacker->retval);
+		} else {
+			zval zv;
+			ZVAL_COPY_VALUE(&zv, &unpacker->retval);
+
+			if (msgpack_convert_object(return_value, object, &zv) != SUCCESS) {
+				zval_ptr_dtor(&zv);
+				RETURN_NULL();
+			}
 			zval_ptr_dtor(&zv);
-			RETURN_NULL();
 		}
-		zval_ptr_dtor(&zv);
+		ZVAL_UNDEF(&unpacker->retval);
+	} else {
+		RETURN_FALSE;
 	}
 
 	ZEND_MN(msgpack_unpacker_reset)(INTERNAL_FUNCTION_PARAM_PASSTHRU);
@@ -483,7 +484,6 @@ static ZEND_METHOD(msgpack_unpacker, reset) /* {{{ */ {
     msgpack_unserialize_var_destroy(&unpacker->var_hash, unpacker->error);
     unpacker->error = 0;
 
-
     template_init(&unpacker->mp);
 
     msgpack_unserialize_var_init(&unpacker->var_hash);