Check NULL: Wi-Fi technology state

diff --git a/debian/changelog b/debian/changelog
index 35d6a1c8ef9ea1048b8ef758e00dc6d1baed853e..c5169274789e7c7ffc6e88d38e949d1f5856773e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+net-config (0.1.82) unstable; urgency=low
+
+  * Check NULL: Wi-Fi technology state
+  * Git: slp/pkgs/n/net-config
+  * Tag: net-config_0.1.82
+
+ -- Danny Jeongseok Seo <s.seo@samsung.com>  Thu, 17 May 2012 16:20:17 +0900
+
 net-config (0.1.81) unstable; urgency=low
 
   * Revise private vconf key name

diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index 24ef73a011d200011f0e4c01e55252f7de9b54af..3c4bba28e93db832d640da6739584288fbc4c2c5 100644 (file)
--- a/packaging/net-config.spec
+++ b/packaging/net-config.spec
@@ -2,7 +2,7 @@
 
 Name:       net-config
 Summary:    TIZEN Network Configuration Module
-Version:    0.1.81
+Version:    0.1.82
 Release:    1
 Group:      System/Network
 License:    Apache License Version 2.0

diff --git a/src/network-state.c b/src/network-state.c
index ffdaeb0e2bc6d052c2bc4dc5fde8d73f4d2a1fbc..7986f9ba4ec88d740c9c68d9e191e4cfc302e128 100644 (file)
--- a/src/network-state.c
+++ b/src/network-state.c
@@ -203,10 +203,12 @@ gboolean netconfig_iface_network_state_update_default_connection_info(
                                __netconfig_pop_3g_alert_syspoppup();
                }
 
-               if (g_str_equal(ip, ip_addr) != TRUE)
+               if (ip != NULL && ip_addr != NULL &&
+                               g_str_equal(ip, ip_addr) != TRUE)
                        vconf_set_str(VCONFKEY_NETWORK_IP, ip_addr);
 
-               if (g_str_equal(proxy, proxy_addr) != TRUE)
+               if (proxy != NULL && proxy_addr != NULL &&
+                               g_str_equal(proxy, proxy_addr) != TRUE)
                        vconf_set_str(VCONFKEY_NETWORK_PROXY, proxy_addr);
 
                vconf_set_int(VCONFKEY_NETWORK_CONFIGURATION_CHANGE_IND, 1);

diff --git a/src/wifi-power.c b/src/wifi-power.c
index 6edd88dfaf14c4f59aace28209a316a7bc02cf57..511fd7c4f75e461f738ec1c5157dc9c9ee61f472 100644 (file)
--- a/src/wifi-power.c
+++ b/src/wifi-power.c
@@ -320,6 +320,11 @@ static gboolean __netconfig_wifi_try_to_load_driver(void)
                wifi_tech_state = netconfig_wifi_get_technology_state();
                INFO("Wi-Fi technology state: %s", wifi_tech_state);
 
+               if (wifi_tech_state == NULL) {
+                       DBG("Failed to get Wi-Fi technology state");
+                       continue;
+               }
+
                if (g_str_equal(wifi_tech_state, "EnabledTechnologies") == TRUE) {
                        netconfig_wifi_update_power_state(TRUE);
 
@@ -351,6 +356,11 @@ static gboolean __netconfig_wifi_try_to_remove_driver(void)
                wifi_tech_state = netconfig_wifi_get_technology_state();
                INFO("Wi-Fi technology state: %s", wifi_tech_state);
 
+               if (wifi_tech_state == NULL) {
+                       DBG("Failed to get Wi-Fi technology state");
+                       continue;
+               }
+
                if (g_str_equal(wifi_tech_state, "EnabledTechnologies") != TRUE) {
                        netconfig_wifi_update_power_state(FALSE);