diff --git a/interfaces/plugin/src/sensor_js.cpp b/interfaces/plugin/src/sensor_js.cpp index 35a0c95165c2c54bbb2702e98049ef0b1e2bd723..11b83247be5e852694dc180bc3419f9978914fbd 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 ac93b115d2d1639a024075c9cc00aab0cda56824..05c4999c12ce9042ddb6e14ca69603b0182363f1 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 3bccea20208cdc094dbab8a399dc0b156427177d..19a6a426f6c1dd6b33af54dc4bcab93676246ee6 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 retVal = memcpy_s(&storedEvent, sizeof(storedEvent), &event, sizeof(event)); + if (retVal != 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 29cbf98231ff00e844febbde70b0408b16659365..e60040d74130d39538a36334f9250a8ed68f569b 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