Merge "Fix crash caused by decryption response delay" into tizen

[platform/upstream/connman.git] / src / network.c

diff --git a/src/network.c b/src/network.c
index 568bad5..46a4af9 100755 (executable)
--- a/src/network.c
+++ b/src/network.c
@@ -58,13 +58,11 @@ static DBusConnection *connection;
 
 #define DHCP_RETRY_TIMEOUT     10
 
-#if defined TIZEN_EXT_INS
+#if defined TIZEN_EXT
 static unsigned char invalid_bssid[WIFI_BSSID_LEN_MAX] = {
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
-#endif
 
-#if defined TIZEN_EXT
 static GHashTable *dhcp_status_list = NULL;
 #endif
 
@@ -1367,9 +1365,9 @@ static void network_destruct(struct connman_network *network)
 #if defined TIZEN_EXT
        g_slist_free_full(network->wifi.vsie_list, g_free);
        g_slist_free_full(network->wifi.bssid_list, g_free);
-#endif
-#if defined TIZEN_EXT_INS
-       g_hash_table_destroy(network->wifi.assoc_reject_table);
+
+       if (TIZEN_INS_ENABLED)
+               g_hash_table_destroy(network->wifi.assoc_reject_table);
 #endif
        g_free(network->path);
        g_free(network->group);
@@ -2142,10 +2140,17 @@ dbus_bool_t __connman_network_notify_dhcp_changed(const char *key, const char *v
        DBusMessageIter iter;
        dbus_bool_t result = FALSE;
 
-       if (val)
-               DBG("key %s, val %s", key, val);
-       else
+       if (val) {
+               if (!g_utf8_validate(val, -1, NULL)) {
+                       DBG("key %s, invalid val", key);
+                       val = "";
+               } else {
+                       DBG("key %s, val %s", key, val);
+               }
+       } else {
                DBG("key %s, val NULL", key);
+               val = "";
+       }
 
        signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
                        CONNMAN_MANAGER_INTERFACE, "DhcpChanged");
@@ -2750,7 +2755,6 @@ unsigned int connman_network_get_max_bssid_count(struct connman_network *network
        return network->wifi.max_bssid_count;
 }
 
-#if defined TIZEN_EXT_INS
 int connman_network_set_last_connected_bssid(struct connman_network *network,
                                const unsigned char *bssid)
 {
@@ -2791,7 +2795,6 @@ GHashTable *connman_network_get_assoc_reject_table(struct connman_network *netwo
 
        return network->wifi.assoc_reject_table;
 }
-#endif /* defined TIZEN_EXT_INS */
 
 __time_t connman_network_get_roam_scan_time(struct connman_network *network)
 {