Merge "Modified logic to process each VSIE of all vendors." into tizen accepted/tizen/unified/20180123.061054 submit/tizen/20180122.055424 submit/tizen/20180122.055447
authortaesub kim <taesub.kim@samsung.com>
Mon, 22 Jan 2018 05:52:51 +0000 (05:52 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Mon, 22 Jan 2018 05:52:51 +0000 (05:52 +0000)
gsupplicant/supplicant.c

index 4bfa10e..243dcd0 100755 (executable)
@@ -5248,11 +5248,13 @@ static void decryption_request_reply(DBusPendingCall *call,
        if (dbus_set_error_from_message(&error, reply)) {
                SUPPLICANT_DBG("decryption_request_reply() %s %s", error.name, error.message);
                dbus_error_free(&error);
+               ret = -EINVAL;
                goto done;
        }
 
        if (dbus_message_iter_init(reply, &args) == FALSE) {
                SUPPLICANT_DBG("dbus_message_iter_init() failed");
+               ret = -EINVAL;
                goto done;
        }
 
@@ -5267,6 +5269,7 @@ static void decryption_request_reply(DBusPendingCall *call,
                interface_add_network_result, data,
                data->interface);
 
+done:
        if (ret < 0) {
                SUPPLICANT_DBG("AddNetwork failed %d", ret);
                callback_assoc_failed(decrypt_request_data.data->user_data);
@@ -5275,7 +5278,6 @@ static void decryption_request_reply(DBusPendingCall *call,
                dbus_free(data);
        }
 
-done:
        dbus_message_unref(reply);
        dbus_pending_call_unref(call);