Fix memory leaks and dereference without null check

Change-Id: I7accd1386302c26e5bdfa8aee224fe60defc50af
Signed-off-by: Jaehyun Kim <jeik01.kim@samsung.com>

diff --git a/plugins/wifi.c b/plugins/wifi.c
index 6a886d5ca1fd7c7ef1de6a31446274afa911376b..4257a5d48c3c8d9ca9e502f147560d6e5f686880 100755 (executable)
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -2643,6 +2643,9 @@ static int get_latest_connections(int max_ssids,
                                g_sequence_free(latest_list);
                                g_key_file_free(keyfile);
                                g_free(ssid);
+#if defined TIZEN_EXT
+                               g_strfreev(services);
+#endif
                                return -ENOMEM;
                        }
 
@@ -5244,6 +5247,8 @@ static void network_changed(GSupplicantNetwork *network, const char *property)
                        need_save = connman_device_set_last_connected_ident(wifi->device, service_ident);
                        if (need_save)
                                connman_device_save_last_connected(wifi->device);
+
+                       g_free(service_ident);
                }
 
                connman_network_set_last_connected_bssid(connman_network,

diff --git a/src/service.c b/src/service.c
index e4dbc32fbd55405b25158232ac7ea499f54d3e46..2b69a0bb770409eb08ad6502b4a2d2b13359c41c 100755 (executable)
--- a/src/service.c
+++ b/src/service.c
@@ -1834,6 +1834,7 @@ static void __connman_manage_saved_profiles()
                if (!entry) {
                        g_sequence_free(profile_list);
                        g_key_file_free(keyfile);
+                       g_strfreev(services);
                        return;
                }
 
@@ -1857,6 +1858,7 @@ static void __connman_manage_saved_profiles()
        }
 
        g_sequence_free(profile_list);
+       g_strfreev(services);
 }
 #endif
 

diff --git a/vpn/plugins/openvpn.c b/vpn/plugins/openvpn.c
index 9e8ccebfb66e03c07aa0c7e6cb410551d823d7cf..ef0bf7824c2941cf1d21fd54d314b9e0308f94a7 100755 (executable)
--- a/vpn/plugins/openvpn.c
+++ b/vpn/plugins/openvpn.c
@@ -152,8 +152,15 @@ static struct nameserver_entry *ov_append_dns_entries(const char *key,
                                options[2]) {
 
                entry = g_try_new(struct nameserver_entry, 1);
+#if defined TIZEN_EXT
+               if (!entry) {
+                       g_strfreev(options);
+                       return NULL;
+               }
+#else
                if (!entry)
                        return NULL;
+#endif
 
                entry->nameserver = g_strdup(options[2]);
                entry->id = atoi(key + 15); /* foreign_option_XXX */

diff --git a/vpn/vpn-provider.c b/vpn/vpn-provider.c
index 0e01ca2a7239ac01fc46e54898ef2d9b2da70830..8d2836efe0c2718385115785bfd4bf19dbb21565 100755 (executable)
--- a/vpn/vpn-provider.c
+++ b/vpn/vpn-provider.c
@@ -2746,6 +2746,10 @@ void vpn_provider_set_data(struct vpn_provider *provider, void *data)
 
 void *vpn_provider_get_plugin_data(struct vpn_provider *provider)
 {
+#if defined TIZEN_EXT
+       if (!provider)
+               return NULL;
+#endif
        return provider->plugin_data;
 }