Merge "Revert "Fix SVACE issue for CID:24236, 31182"" into tizen

diff --git a/packaging/connman.spec b/packaging/connman.spec
index 4238f16..c54b2bf 100755 (executable)
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -5,7 +5,7 @@
 
 Name:           connman
 Version:        1.29
-Release:        23
+Release:        24
 License:        GPL-2.0+
 Summary:        Connection Manager
 Url:            http://connman.net

diff --git a/src/log.c b/src/log.c
index 32b35bc..2805c3e 100755 (executable)
--- a/src/log.c
+++ b/src/log.c
@@ -52,6 +52,7 @@ static const char *program_path;
 #define syslog __connman_log_s
 
 static FILE *log_file = NULL;
+void __connman_log_s(int log_priority, const char *format, ...);
 
 void __connman_log_open(const char *ident, int option, int facility)
 {

diff --git a/src/technology.c b/src/technology.c
index 2c2df83..408c99f 100755 (executable)
--- a/src/technology.c
+++ b/src/technology.c
@@ -1247,8 +1247,10 @@ static DBusMessage *specific_scan(DBusConnection *conn, DBusMessage *msg, void *
                dbus_message_iter_recurse(&entry, &value2);
                type = dbus_message_iter_get_arg_type(&value2);
                if (g_str_equal(key, "SSID")) {
-                       if (type != DBUS_TYPE_STRING)
+                       if (type != DBUS_TYPE_STRING) {
+                               g_slist_free_full(specific_scan_list, g_free);
                                return __connman_error_invalid_arguments(msg);
+                       }
 
                        scan_type = 1; /* SSID based scan */
                        dbus_message_iter_get_basic(&value2, &name);