Fix Svace issues WGID 143851, 152686, 152691

Change-Id: I42d8ddcad12cde927790f6fd9dbd863cfa7945be
Signed-off-by: Yu jiung <jiung.yu@samsung.com>

diff --git a/packaging/ug-setting-wifidirect-efl.spec b/packaging/ug-setting-wifidirect-efl.spec
index 731a13d..e431e88 100644 (file)
--- a/packaging/ug-setting-wifidirect-efl.spec
+++ b/packaging/ug-setting-wifidirect-efl.spec
@@ -1,6 +1,6 @@
 Name:       ug-setting-wifidirect-efl
 Summary:    Wi-Fi Direct setting UI gadget
-Version:    1.11.83
+Version:    1.11.84
 Release:    1
 Group:      Applications/Network
 License:    Flora-1.1

diff --git a/popup-wifidirect/src/wfd-app-client.c b/popup-wifidirect/src/wfd-app-client.c
index 43bb060..737f47f 100644 (file)
--- a/popup-wifidirect/src/wfd-app-client.c
+++ b/popup-wifidirect/src/wfd-app-client.c
@@ -64,8 +64,8 @@ bool _wfd_connected_peer_cb(wifi_direct_connected_peer_info_s *peer, void *user_
        }
 
        int peer_cnt = ad->raw_connected_peer_cnt;
-       strncpy(ad->raw_connected_peers[peer_cnt].ssid, peer->device_name, sizeof(ad->raw_connected_peers[peer_cnt].ssid) - 1);
-       strncpy(ad->raw_connected_peers[peer_cnt].mac_address, peer->mac_address, WFD_MAC_ADDRESS_SIZE - 1);
+       g_strlcpy(ad->raw_connected_peers[peer_cnt].ssid, peer->device_name, sizeof(ad->raw_connected_peers[peer_cnt].ssid));
+       g_strlcpy(ad->raw_connected_peers[peer_cnt].mac_address, peer->mac_address, WFD_MAC_ADDRESS_SIZE);
 
        ad->raw_connected_peer_cnt++;
 

diff --git a/popup-wifidirect/src/wfd-app-util.c b/popup-wifidirect/src/wfd-app-util.c
index 96ffea1..eb99384 100644 (file)
--- a/popup-wifidirect/src/wfd-app-util.c
+++ b/popup-wifidirect/src/wfd-app-util.c
@@ -61,7 +61,7 @@ char *wfd_app_trim_path(const char *filewithpath)
        const char *space = "                                        ";
        int len = strlen(filewithpath);
 
-       if (len > 20) {
+       if (len >= 20) {
                strptr = (char *) filewithpath + (len - 20);
                start = 0;
        } else if (len < 20) {
@@ -70,7 +70,8 @@ char *wfd_app_trim_path(const char *filewithpath)
        }
 
        strncpy((char *) filename, space, strlen(space));
-       strncpy((char *) filename + start, strptr, 50);
+       if(strptr)
+               strncpy((char *) filename + start, strptr, 50);
 
        return (char *) filename;
 #endif

diff --git a/ug-wifidirect/src/wfd_client.c b/ug-wifidirect/src/wfd_client.c
index 4d0052b..0c15a91 100644 (file)
--- a/ug-wifidirect/src/wfd_client.c
+++ b/ug-wifidirect/src/wfd_client.c
@@ -636,11 +636,11 @@ bool _wfd_connected_peer_cb(wifi_direct_connected_peer_info_s *peer, void *user_
                DBG(LOG_INFO, "\tServices: [%s]\n", services);
        }
 
-       strncpy(ugd->raw_connected_peers[peer_cnt].ssid, peer->device_name, sizeof(ugd->raw_connected_peers[peer_cnt].ssid) - 1);
+       g_strlcpy(ugd->raw_connected_peers[peer_cnt].ssid, peer->device_name, sizeof(ugd->raw_connected_peers[peer_cnt].ssid));
        ugd->raw_connected_peers[peer_cnt].category = peer->primary_device_type;
        ugd->raw_connected_peers[peer_cnt].sub_category = peer->secondary_device_type;
-       strncpy(ugd->raw_connected_peers[peer_cnt].mac_addr, peer->mac_address, MAC_LENGTH - 1);
-       strncpy(ugd->raw_connected_peers[peer_cnt].if_addr, peer->interface_address, MAC_LENGTH - 1);
+       g_strlcpy(ugd->raw_connected_peers[peer_cnt].mac_addr, peer->mac_address, MAC_LENGTH);
+       g_strlcpy(ugd->raw_connected_peers[peer_cnt].if_addr, peer->interface_address, MAC_LENGTH);
        ugd->raw_connected_peers[peer_cnt].conn_status = PEER_CONN_STATUS_CONNECTED;
 
        DBG(LOG_INFO, "\tStatus: [%d]\n", ugd->raw_connected_peers[peer_cnt].conn_status);

diff --git a/ug-wifidirect/src/wfd_ug_main_view.c b/ug-wifidirect/src/wfd_ug_main_view.c
index 7b3dba0..00126c2 100755 (executable)
--- a/ug-wifidirect/src/wfd_ug_main_view.c
+++ b/ug-wifidirect/src/wfd_ug_main_view.c
@@ -1366,13 +1366,14 @@ void wfd_ug_update_toolbar(struct ug_data *ugd)
                        elm_object_part_content_set(ugd->button_layout, "button.next", btn);
                        ugd->disconnect_btn = btn;
                        evas_object_show(ugd->disconnect_btn);
+                       DBG(LOG_INFO, "button: disconnect button added\n");
                }
                elm_object_part_content_set(ugd->button_layout, "button.prev",
                                ugd->scan_toolbar);
                wfd_ug_view_refresh_button(ugd->scan_toolbar,
                                "IDS_WIFI_SK4_SCAN", TRUE);
                evas_object_data_set(ugd->disconnect_btn, "multi", "disconnect");
-               DBG(LOG_INFO, "button: disconnect button added\n");
+               DBG(LOG_INFO, "button: scan button added\n");
        } else {
                if (no_of_conn_dev == 0 && ugd->disconnect_btn != NULL) {
                        DBG(LOG_INFO, "disconnect btn removed when conn failed\n");