Merge "g_free 'field' and 'value' if you break out of a while loop." into tizen

[platform/core/connectivity/net-config.git] / src / wifi-config.c

diff --git a/src/wifi-config.c b/src/wifi-config.c
index 6901e6c..943a6cf 100755 (executable)
--- a/src/wifi-config.c
+++ b/src/wifi-config.c
@@ -369,10 +369,12 @@ static gboolean _load_configuration(const gchar *config_id, struct wifi_config *
                        DBG("g_key_file_get_integer failed error[%d: %s]", error->code, error->message);
                        g_error_free(error);
                } else {
-                       addr = 0xffffffff << (32 - prefix_len);
-                       netmask.s_addr = htonl(addr);
-                       mask = inet_ntoa(netmask);
-                       config->ip_info->subnet_mask = g_strdup(mask);
+                       if (prefix_len > 0 && prefix_len < 32) {
+                               addr = 0xffffffff << (32 - prefix_len);
+                               netmask.s_addr = htonl(addr);
+                               mask = inet_ntoa(netmask);
+                               config->ip_info->subnet_mask = g_strdup(mask);
+                       }
                        if (config->ip_info->subnet_mask)
                                DBG("IPv4.SubnetMask:%s", config->ip_info->subnet_mask);
                }
@@ -1306,9 +1308,10 @@ gboolean handle_save_configuration(Wifi *wifi, GDBusMethodInvocation *context,
        if (conf->ip_info->subnet_mask != NULL) {
                unsigned char prefix_len;
                prefix_len = __netconfig_convert_netmask_to_prefixlen(
-                                                                 conf->ip_info->subnet_mask);
-               g_key_file_set_integer(keyfile, group_name,
-                                                WIFI_CONFIG_IPV4_SUBNET_MASK, prefix_len);
+                               conf->ip_info->subnet_mask);
+               if (prefix_len > 0 && prefix_len < 32)
+                       g_key_file_set_integer(keyfile, group_name,
+                                       WIFI_CONFIG_IPV4_SUBNET_MASK, prefix_len);
        }
 
        if (conf->ip_info->prefix_length > 0)
@@ -1712,7 +1715,7 @@ gboolean handle_set_config_field(Wifi *wifi, GDBusMethodInvocation *context,
        g_return_val_if_fail(config_id != NULL, TRUE);
        g_return_val_if_fail(key != NULL, TRUE);
 
-       DBG("Key[%s] Value[%d]", key, value);
+       DBG("Key[%s] Value[%s]", key, value);
 
        if (g_strcmp0(key, WIFI_CONFIG_PROXYADDRESS) == 0) {
                ret = _set_field(config_id, WIFI_CONFIG_PROXY_METHOD, "manual");