From 466780907e208381db03ba8f611cb0963410e606 Mon Sep 17 00:00:00 2001
From: agrkush <kush.agrawal@samsung.com>
Date: Tue, 8 Jan 2019 18:32:46 +0530
Subject: [PATCH] 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: Id356d1b4f5d5fd28f4c8c909b715ec325f4ff869
Signed-off-by: agrkush <kush.agrawal@samsung.com>
Signed-off-by: Amit KS <amit.s12@samsung.com>
---
 resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient_vd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 5fd6ad6..a79a307 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;
-- 
2.7.4