From a690fe2b2a84b164f31eb878fcff38c42d259e63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E9=9C=B2?= Date: Thu, 24 Feb 2022 11:12:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?memcpy=5Fs=E3=80=81strcpy=5Fs=E7=AD=89?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=87=BD=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: bailu1992 --- interfaces/plugin/src/sensor_js.cpp | 6 ++++-- .../hdi_connection/adapter/src/compatible_connection.cpp | 3 ++- services/sensor/src/client_info.cpp | 4 ++-- services/sensor/src/sensor_data_processer.cpp | 3 ++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/interfaces/plugin/src/sensor_js.cpp b/interfaces/plugin/src/sensor_js.cpp index 35a0c951..11b83247 100644 --- a/interfaces/plugin/src/sensor_js.cpp +++ b/interfaces/plugin/src/sensor_js.cpp @@ -55,7 +55,8 @@ static void DataCallbackImpl(SensorEvent *event) onCallbackInfo->data.sensorData.sensorTypeId = sensorTypeId; onCallbackInfo->data.sensorData.dataLength = event->dataLen; onCallbackInfo->data.sensorData.timestamp = event->timestamp; - if (memcpy_s(onCallbackInfo->data.sensorData.data, event->dataLen, data, event->dataLen) != EOK) { + errno_t ret = memcpy_s(onCallbackInfo->data.sensorData.data, event->dataLen, data, event->dataLen); + if (ret != EOK) { HiLog::Error(LABEL, "%{public}s copy data failed", __func__); return; } @@ -71,7 +72,8 @@ static void DataCallbackImpl(SensorEvent *event) onceCallbackInfo->data.sensorData.sensorTypeId = sensorTypeId; onceCallbackInfo->data.sensorData.dataLength = event->dataLen; onceCallbackInfo->data.sensorData.timestamp = event->timestamp; - if (memcpy_s(onceCallbackInfo->data.sensorData.data, event->dataLen, data, event->dataLen) != EOK) { + errno_t ret = memcpy_s(onceCallbackInfo->data.sensorData.data, event->dataLen, data, event->dataLen); + if (ret != EOK) { HiLog::Error(LABEL, "%{public}s copy data failed", __func__); return; } diff --git a/services/sensor/hdi_connection/adapter/src/compatible_connection.cpp b/services/sensor/hdi_connection/adapter/src/compatible_connection.cpp index ac93b115..05c4999c 100644 --- a/services/sensor/hdi_connection/adapter/src/compatible_connection.cpp +++ b/services/sensor/hdi_connection/adapter/src/compatible_connection.cpp @@ -136,7 +136,8 @@ int32_t CompatibleConnection::SensorDataCallback(const struct SensorEvents *even .dataLen = event->dataLen }; sensorEvent.data = new uint8_t[SENSOR_DATA_LENGHT]; - if (memcpy_s(sensorEvent.data, event->dataLen, event->data, event->dataLen) != EOK) { + errno_t ret = memcpy_s(sensorEvent.data, event->dataLen, event->data, event->dataLen); + if (ret != EOK) { HiLog::Error(LABEL, "%{public}s copy data failed", __func__); return COPY_ERR; } diff --git a/services/sensor/src/client_info.cpp b/services/sensor/src/client_info.cpp index 3bccea20..a1543f37 100644 --- a/services/sensor/src/client_info.cpp +++ b/services/sensor/src/client_info.cpp @@ -474,8 +474,8 @@ void ClientInfo::StoreEvent(const struct SensorEvent &event) HiLog::Error(LABEL, "%{public}s GetSensorList failed", __func__); return; } - - if (memcpy_s(&storedEvent, sizeof(storedEvent), &event, sizeof(event)) != EOK) { + errno_t ret = memcpy_s(&storedEvent, sizeof(storedEvent), &event, sizeof(event)); + if (ret != EOK) { HiLog::Error(LABEL, "%{public}s memcpy_s failed", __func__); return; } diff --git a/services/sensor/src/sensor_data_processer.cpp b/services/sensor/src/sensor_data_processer.cpp index 29cbf982..e60040d7 100644 --- a/services/sensor/src/sensor_data_processer.cpp +++ b/services/sensor/src/sensor_data_processer.cpp @@ -251,7 +251,8 @@ void SensorDataProcesser::SendRawData(std::unordered_map Date: Thu, 24 Feb 2022 15:42:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?memcpy=5Fs=E3=80=81strcpy=5Fs=E7=AD=89?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=87=BD=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: bailu1992 --- services/sensor/src/client_info.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/sensor/src/client_info.cpp b/services/sensor/src/client_info.cpp index a1543f37..19a6a426 100644 --- a/services/sensor/src/client_info.cpp +++ b/services/sensor/src/client_info.cpp @@ -474,8 +474,8 @@ void ClientInfo::StoreEvent(const struct SensorEvent &event) HiLog::Error(LABEL, "%{public}s GetSensorList failed", __func__); return; } - errno_t ret = memcpy_s(&storedEvent, sizeof(storedEvent), &event, sizeof(event)); - if (ret != EOK) { + errno_t retVal = memcpy_s(&storedEvent, sizeof(storedEvent), &event, sizeof(event)); + if (retVal != EOK) { HiLog::Error(LABEL, "%{public}s memcpy_s failed", __func__); return; } -- Gitee