From: agrkush <kush.agrawal@samsung.com>
Date: Tue, 8 Jan 2019 13:02:46 +0000 (+0530)
Subject: Fixes in Tizen LE Client
X-Git-Tag: accepted/tizen/unified/20190128.061218~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F75%2F197175%2F1;p=platform%2Fupstream%2Fiotivity.git

Fixes in Tizen LE Client

1. Fix for crash when BT disconnect is called in between
   GATT connection procedure.

2. Setting NULL terminated manufacture data string.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/389
(cherry picked from commit fadf16daaaf5f9980c5a76975ec1c07bc546c501)

Change-Id: Ib372b1ab4ad1f2484c5aa8f8a8cbf412a497d6e9
Signed-off-by: agrkush <kush.agrawal@samsung.com>
Signed-off-by: Amit KS <amit.s12@samsung.com>
---

diff --git a/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient_vd.c b/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient_vd.c
index 8bf7ebf..c00ae23 100644
--- a/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient_vd.c
+++ b/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient_vd.c
@@ -426,7 +426,7 @@ static bool CALEIsHaveServiceImpl(bt_adapter_le_device_scan_result_info_s *scanI
             for(int i=0;i<man_data_len;i++){
                 pos += sprintf(compare_man_data+pos, "%.2x", man_data[i]);
             }
-            compare_man_data[man_data_len]='\0';
+            compare_man_data[(man_data_len*2)+1]='\0';
             if (man_id == samsung_code && 0 == strncasecmp(compare_man_data, service_uuid, CUSTOM_UUID_LEN))
             {
                 OIC_LOG_V(DEBUG, TAG, "Manufacture Data[%s] Found in %s",
@@ -1387,6 +1387,7 @@ CAResult_t CALEGattDiscoverServices(const char *remoteAddress)
 
 error_exit:
     bt_gatt_client_destroy(serverInfo->clientHandle);
+    serverInfo->clientHandle = NULL;
     oc_mutex_unlock(g_LEServerListMutex);
     CALEGattDisConnect(remoteAddress);
     return CA_STATUS_FAILED;