From 952a8c8a282f5cbbea5235cf2ea3b2bc0ce19381 Mon Sep 17 00:00:00 2001
From: yuqianyuan <yuqianyuan@huawei.com>
Date: Sat, 14 Aug 2021 17:45:39 +0800
Subject: [PATCH 1/3] bug fix

Signed-off-by: yuqianyuan <yuqianyuan@huawei.com>
---
 .../include/authdemo/hichain_adapter.h         |  1 -
 .../src/authdemo/hichain_adapter.cpp           | 18 ++++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/services/devicemanagerservice/include/authdemo/hichain_adapter.h b/services/devicemanagerservice/include/authdemo/hichain_adapter.h
index bc9b23ea6..55ca7e5b2 100644
--- a/services/devicemanagerservice/include/authdemo/hichain_adapter.h
+++ b/services/devicemanagerservice/include/authdemo/hichain_adapter.h
@@ -91,7 +91,6 @@ private:
 
 private:
     std::atomic<int32_t> requestIdIndex_ {0};
-    nlohmann::json bindRequestJsonObj_;
     std::map<int64_t, std::string> bindingDeviceMap_;
     std::map<int64_t, std::shared_ptr<DeviceClientChannel>> clientBindReqMap_;
     std::map<int64_t, std::shared_ptr<BindCallback>> bindCallBackMap_;
diff --git a/services/devicemanagerservice/src/authdemo/hichain_adapter.cpp b/services/devicemanagerservice/src/authdemo/hichain_adapter.cpp
index ebf5e1dba..2276c90e2 100644
--- a/services/devicemanagerservice/src/authdemo/hichain_adapter.cpp
+++ b/services/devicemanagerservice/src/authdemo/hichain_adapter.cpp
@@ -18,6 +18,7 @@
 #include <cstdlib>
 #include <ctime>
 #include <functional>
+#include <securec.h>
 
 #include "parameter.h"
 
@@ -26,6 +27,7 @@
 #include "device_manager_log.h"
 #include "device_server_channel.h"
 
+
 namespace OHOS {
 namespace DistributedHardware {
 namespace {
@@ -262,13 +264,16 @@ char* HichainAdapter::OnBindRequest(int64_t requestId, int operationCode, const
     (void)reqParams;
 
     HILOGI("HichainAdapter::OnBindRequest.");
-    bindRequestJsonObj_.clear();
-    bindRequestJsonObj_[FIELD_CONFIRMATION] = REQUEST_ACCEPTED;
-    bindRequestJsonObj_[FIELD_PIN_CODE] = PIN_CODE;
+    nlohmann::json jsonObj;
+    jsonObj[FIELD_CONFIRMATION] = REQUEST_ACCEPTED;
+    jsonObj[FIELD_PIN_CODE] = PIN_CODE;
     char localDeviceId[DEVICE_UUID_LENGTH] = {0};
     GetDevUdid(localDeviceId, DEVICE_UUID_LENGTH);
-    bindRequestJsonObj_[FIELD_DEVICE_ID] = localDeviceId;
-    return (char*) bindRequestJsonObj_.dump().c_str();
+    jsonObj[FIELD_DEVICE_ID] = localDeviceId;
+
+    std::string jsonStr = jsonObj.dump();
+    char *buffer = strdup(jsonStr.c_str());
+    return buffer;
 }
 
 void HichainAdapter::OnBindSuccess(int64_t requestId, const char* returnData)
@@ -373,7 +378,8 @@ void HichainAuthCallBack::onError(int64_t requestId, int operationCode, int erro
 char* HichainAuthCallBack::onBindRequest(int64_t requestId, int operationCode, const char *reqParams)
 {
     HILOGI("HichainAuthCallBack::onBindRequest reqId:%{public}lld, operation:%{public}d.", requestId, operationCode);
-    return HichainAdapter::GetInstance().OnBindRequest(requestId, operationCode, reqParams);
+	char * ret = HichainAdapter::GetInstance().OnBindRequest(requestId, operationCode, reqParams);
+    return ret;
 }
 }
 }
-- 
Gitee


From b0ba33ea046e19a46bace5775eafe95f349a28f3 Mon Sep 17 00:00:00 2001
From: yqy2012 <yuqianyuan@huawei.com>
Date: Mon, 16 Aug 2021 02:03:09 +0000
Subject: [PATCH 2/3] update
 services/devicemanagerservice/src/authdemo/hichain_adapter.cpp.

---
 services/devicemanagerservice/src/authdemo/hichain_adapter.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/devicemanagerservice/src/authdemo/hichain_adapter.cpp b/services/devicemanagerservice/src/authdemo/hichain_adapter.cpp
index 2276c90e2..b16d8384c 100644
--- a/services/devicemanagerservice/src/authdemo/hichain_adapter.cpp
+++ b/services/devicemanagerservice/src/authdemo/hichain_adapter.cpp
@@ -378,8 +378,7 @@ void HichainAuthCallBack::onError(int64_t requestId, int operationCode, int erro
 char* HichainAuthCallBack::onBindRequest(int64_t requestId, int operationCode, const char *reqParams)
 {
     HILOGI("HichainAuthCallBack::onBindRequest reqId:%{public}lld, operation:%{public}d.", requestId, operationCode);
-	char * ret = HichainAdapter::GetInstance().OnBindRequest(requestId, operationCode, reqParams);
-    return ret;
+    return HichainAdapter::GetInstance().OnBindRequest(requestId, operationCode, reqParams);
 }
 }
 }
-- 
Gitee


From c8a2ad4b9f27485c8cd1894c346ea537f9d48c81 Mon Sep 17 00:00:00 2001
From: yqy2012 <yuqianyuan@huawei.com>
Date: Mon, 16 Aug 2021 11:49:46 +0000
Subject: [PATCH 3/3] update
 services/devicemanagerservice/src/authdemo/hichain_adapter.cpp.
 Signed-off-by: check <yuqianyuan@huawei.com>

---
 services/devicemanagerservice/src/authdemo/hichain_adapter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/devicemanagerservice/src/authdemo/hichain_adapter.cpp b/services/devicemanagerservice/src/authdemo/hichain_adapter.cpp
index b16d8384c..5ccc74020 100644
--- a/services/devicemanagerservice/src/authdemo/hichain_adapter.cpp
+++ b/services/devicemanagerservice/src/authdemo/hichain_adapter.cpp
@@ -377,7 +377,7 @@ void HichainAuthCallBack::onError(int64_t requestId, int operationCode, int erro
 
 char* HichainAuthCallBack::onBindRequest(int64_t requestId, int operationCode, const char *reqParams)
 {
-    HILOGI("HichainAuthCallBack::onBindRequest reqId:%{public}lld, operation:%{public}d.", requestId, operationCode);
+    HILOGI("HichainAuthCallBack::onBindRequest reqId:%{public}lld, operation: %{public}d.", requestId, operationCode);
     return HichainAdapter::GetInstance().OnBindRequest(requestId, operationCode, reqParams);
 }
 }
-- 
Gitee