From 98c90d71ad91dcdb306f1918ccbe45e5bd5e7175 Mon Sep 17 00:00:00 2001 From: yuqianyuan Date: Sat, 14 Aug 2021 15:55:11 +0800 Subject: [PATCH 1/2] change hichain adapter --- .../src/authdemo/hichain_adapter.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/services/devicemanagerservice/src/authdemo/hichain_adapter.cpp b/services/devicemanagerservice/src/authdemo/hichain_adapter.cpp index ebf5e1dba..435e49605 100644 --- a/services/devicemanagerservice/src/authdemo/hichain_adapter.cpp +++ b/services/devicemanagerservice/src/authdemo/hichain_adapter.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include "parameter.h" @@ -268,7 +269,14 @@ char* HichainAdapter::OnBindRequest(int64_t requestId, int operationCode, const char localDeviceId[DEVICE_UUID_LENGTH] = {0}; GetDevUdid(localDeviceId, DEVICE_UUID_LENGTH); bindRequestJsonObj_[FIELD_DEVICE_ID] = localDeviceId; - return (char*) bindRequestJsonObj_.dump().c_str(); + const char * ret = (const char*) bindRequestJsonObj_.dump().c_str(); + int strLen = strlen(ret)+1; + char * retJsonStr = (char *)malloc(strLen); + if (memcpy_s(retJsonStr, strLen, bindRequestJsonObj_.dump().c_str(), strLen) != 0) { + HILOGE("HichainAdapter::OnBindRequest memcpy failed."); + return nullptr; + } + return retJsonStr; } void HichainAdapter::OnBindSuccess(int64_t requestId, const char* returnData) @@ -373,7 +381,9 @@ 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); + HILOGI("HichainAuthCallBack::onBindRequest %{public}s", ret); + return ret; } } } -- Gitee From b2976a9d75e14dac46ab80d118119ae241c5d41b Mon Sep 17 00:00:00 2001 From: yuqianyuan Date: Sat, 14 Aug 2021 16:11:39 +0800 Subject: [PATCH 2/2] bug fix Signed-off-by: yuqianyuan --- 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 435e49605..efb0691f9 100644 --- a/services/devicemanagerservice/src/authdemo/hichain_adapter.cpp +++ b/services/devicemanagerservice/src/authdemo/hichain_adapter.cpp @@ -382,7 +382,7 @@ char* HichainAuthCallBack::onBindRequest(int64_t requestId, int operationCode, c { HILOGI("HichainAuthCallBack::onBindRequest reqId:%{public}lld, operation:%{public}d.", requestId, operationCode); char * ret = HichainAdapter::GetInstance().OnBindRequest(requestId, operationCode, reqParams); - HILOGI("HichainAuthCallBack::onBindRequest %{public}s", ret); + HILOGI("HichainAuthCallBack::onBindRequest, json str is: %{public}s", ret); return ret; } } -- Gitee