Merge branch 'master' into tizen_2.1

Change-Id: I21a4641aee763a6afbfdeecec558c2e85938da26

3 files changed, 15 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index e767e6b..3a76a83 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ug-setting-wifidirect-efl (1.0.20) precise; urgency=low
+
+  * Prevent issue fixed
+  * Git: rsa/apps/home/ug-wifi-direct
+  * Tag: libug-setting-wifidirect-efl_1.0.20
+
+ -- Gibyoung Kim <laskgb.kim@samsung.com>  Mon, 6 May 2013 17:13:47 +0900
+
 ug-setting-wifidirect-efl (1.0.19) precise; urgency=low
 
   * NOTICE file updated
diff --git a/packaging/libug-setting-wifidirect-efl.spec b/packaging/libug-setting-wifidirect-efl.spec
index 92c2f82..3125665 100755
--- a/packaging/libug-setting-wifidirect-efl.spec
+++ b/packaging/libug-setting-wifidirect-efl.spec
@@ -3,7 +3,7 @@
 
 Name:       libug-setting-wifidirect-efl
 Summary:    Wi-Fi Direct setting UI gadget 
-Version:    1.0.19
+Version:    1.0.20
 Release:    1
 Group:      TO_BE_FILLED
 License:    Flora License
diff --git a/popup-wifidirect/src/wfd-app-client.c b/popup-wifidirect/src/wfd-app-client.c
index 4ef023b..cc088f2 100755
--- a/popup-wifidirect/src/wfd-app-client.c
+++ b/popup-wifidirect/src/wfd-app-client.c
@@ -56,7 +56,9 @@ bool _wfd_connected_peer_cb(wifi_direct_connected_peer_info_s *peer, void *user_
 	WDPOP_LOGD( "%dth connected peer. [%s]\n", peer_cnt, peer->device_name);
 
 	strncpy(ad->raw_connected_peers[peer_cnt].ssid, peer->device_name, sizeof(ad->raw_connected_peers[peer_cnt].ssid));
+	ad->raw_connected_peers[peer_cnt].ssid[31] = '\0';
 	strncpy(ad->raw_connected_peers[peer_cnt].mac_address, peer->mac_address, WFD_MAC_ADDRESS_SIZE);
+	ad->raw_connected_peers[peer_cnt].mac_address[17] = '\0';
 	WDPOP_LOGD( "\tSSID: [%s]\n", ad->raw_connected_peers[peer_cnt].ssid);
 	ad->raw_connected_peer_cnt++;
 
@@ -389,6 +391,7 @@ bool _wfd_app_discoverd_peer_cb(wifi_direct_discovered_peer_info_s *peer, void *
 	if (NULL != peer->device_name) {
 		WDPOP_LOGD( "discovered peer ssid[%s]\n", peer->device_name);
 		strncpy(ad->discovered_peers[ad->discovered_peer_count].ssid, peer->device_name, 32);
+		ad->discovered_peers[ad->discovered_peer_count].ssid[31] = '\0';
 	} else {
 		WDPOP_LOGD( "peer's device name is NULL\n");
 	}
@@ -487,6 +490,7 @@ void _cb_connection(int error_code, wifi_direct_connection_state_e connection_st
 		memset(ad->peer_mac, 0, sizeof(ad->peer_mac));
 		memset(ad->peer_name, 0, sizeof(ad->peer_name));
 		strncpy(ad->peer_mac, mac_address, strlen(mac_address));
+		ad->peer_mac[17] = '\0';
 		peer_info = _wfd_app_find_peer_by_mac_address(ad, mac_address);
 
 		if (NULL == peer_info) {
@@ -496,10 +500,12 @@ void _cb_connection(int error_code, wifi_direct_connection_state_e connection_st
 		} else {
 			WDPOP_LOGD( "SSID from connection is %s.\n", peer_info->ssid);
 			strncpy(ad->peer_name, peer_info->ssid, strlen(peer_info->ssid));
+			ad->peer_name[31] = '\0';
 		}
 
 		if (0 == strlen(ad->peer_name)) {
 			strncpy(ad->peer_name, ad->peer_mac, strlen(ad->peer_mac));
+			ad->peer_name[31] = '\0';
 		}
 	}