Merge "Error checking in passphrase decryption method." into tizen

diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c
index 02e6a62..cfdb183 100755 (executable)
--- a/gsupplicant/supplicant.c
+++ b/gsupplicant/supplicant.c
@@ -7485,8 +7485,16 @@ static int send_decryption_request(const char *passphrase,
        if (!msg)
                return -EINVAL;
 
+#if defined TIZEN_EXT
+       if (!dbus_message_append_args(msg, DBUS_TYPE_STRING, &passphrase,
+                                                       DBUS_TYPE_INVALID)) {
+               SUPPLICANT_DBG("Could not fulfill decryption request");
+               return -ENOMEM;
+       }
+#else
        dbus_message_append_args(msg, DBUS_TYPE_STRING, &passphrase,
                                                        DBUS_TYPE_INVALID);
+#endif
 
        if (!dbus_connection_send_with_reply(connection, msg,
                                &call, DBUS_TIMEOUT_USE_DEFAULT)) {

diff --git a/packaging/connman.spec b/packaging/connman.spec
index 80309a8..501c10e 100644 (file)
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -6,7 +6,7 @@
 
 Name:           connman
 Version:        1.38
-Release:        3
+Release:        4
 License:        GPL-2.0+
 Summary:        Connection Manager
 Url:            http://connman.net