From e5dc005fb0a8750255c6572f72cba47e36b2cf5e Mon Sep 17 00:00:00 2001 From: li-yaoyao777 Date: Sat, 2 Apr 2022 14:45:33 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9sensor=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-yaoyao777 --- services/sensor/src/sensor_data_processer.cpp | 4 ++-- utils/src/report_data_callback.cpp | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/services/sensor/src/sensor_data_processer.cpp b/services/sensor/src/sensor_data_processer.cpp index 0a543ffc..1c3bd060 100644 --- a/services/sensor/src/sensor_data_processer.cpp +++ b/services/sensor/src/sensor_data_processer.cpp @@ -240,9 +240,9 @@ void SensorDataProcesser::SendRawData(std::unordered_map(event.size()); + size_t eventSize = event.size(); std::vector transferEvents; - for (int32_t i = 0; i < eventSize; i++) { + for (size_t i = 0; i < eventSize; i++) { struct TransferSensorEvents transferEvent = { .sensorTypeId = event[i].sensorTypeId, .version = event[i].version, diff --git a/utils/src/report_data_callback.cpp b/utils/src/report_data_callback.cpp index 3f00ae35..8e8dcb41 100644 --- a/utils/src/report_data_callback.cpp +++ b/utils/src/report_data_callback.cpp @@ -64,11 +64,17 @@ int32_t ReportDataCallback::ReportEventCallback(const struct SensorEvent* event, } return ERROR; } +} int32_t leftSize = CIRCULAR_BUF_LEN - cb->eventsBuf_.eventNum; int32_t toEndLen = CIRCULAR_BUF_LEN - cb->eventsBuf_.writePosition; + if (leftSize < 0 || toEndLen < 0){ + SEN_HILOGE("callback or circularBuf or event cannot be null"); + delete[] event->data; + return ERROR; + } if (toEndLen == 0) { - cb->eventsBuf_.circularBuf[0] = *event; - cb->eventsBuf_.writePosition = 1 - toEndLen; + cb->eventsBuf_.circularBuf[0] = *event; + cb->eventsBuf_.writePosition = 1 - toEndLen; } else { cb->eventsBuf_.circularBuf[cb->eventsBuf_.writePosition] = *event; cb->eventsBuf_.writePosition += 1; -- Gitee From 36dc2d3839e06f50d3b8ccef9ffdcebbe43e2080 Mon Sep 17 00:00:00 2001 From: li-yaoyao777 Date: Sat, 2 Apr 2022 14:48:15 +0800 Subject: [PATCH 2/9] report_data_callback.cpp Signed-off-by: li-yaoyao777 --- utils/src/report_data_callback.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/src/report_data_callback.cpp b/utils/src/report_data_callback.cpp index 8e8dcb41..8b4130ba 100644 --- a/utils/src/report_data_callback.cpp +++ b/utils/src/report_data_callback.cpp @@ -76,8 +76,8 @@ int32_t ReportDataCallback::ReportEventCallback(const struct SensorEvent* event, cb->eventsBuf_.circularBuf[0] = *event; cb->eventsBuf_.writePosition = 1 - toEndLen; } else { - cb->eventsBuf_.circularBuf[cb->eventsBuf_.writePosition] = *event; - cb->eventsBuf_.writePosition += 1; + cb->eventsBuf_.circularBuf[cb->eventsBuf_.writePosition] = *event; + cb->eventsBuf_.writePosition += 1; } if (leftSize < 1) { cb->eventsBuf_.readPos = cb->eventsBuf_.writePosition; -- Gitee From b04f67fd0f9a7ad091cf4766164e392a445e2c71 Mon Sep 17 00:00:00 2001 From: li-yaoyao777 Date: Sat, 2 Apr 2022 16:51:35 +0800 Subject: [PATCH 3/9] sensor_data_processer.cpp Signed-off-by: li-yaoyao777 --- utils/src/report_data_callback.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/src/report_data_callback.cpp b/utils/src/report_data_callback.cpp index 8b4130ba..fe05c686 100644 --- a/utils/src/report_data_callback.cpp +++ b/utils/src/report_data_callback.cpp @@ -67,11 +67,11 @@ int32_t ReportDataCallback::ReportEventCallback(const struct SensorEvent* event, } int32_t leftSize = CIRCULAR_BUF_LEN - cb->eventsBuf_.eventNum; int32_t toEndLen = CIRCULAR_BUF_LEN - cb->eventsBuf_.writePosition; - if (leftSize < 0 || toEndLen < 0){ + if (leftSize < 0 || toEndLen < 0) { SEN_HILOGE("callback or circularBuf or event cannot be null"); delete[] event->data; return ERROR; - } + } if (toEndLen == 0) { cb->eventsBuf_.circularBuf[0] = *event; cb->eventsBuf_.writePosition = 1 - toEndLen; -- Gitee From 8fa3f31ea833ba6c075f488b92887ad3e07817cd Mon Sep 17 00:00:00 2001 From: li-yaoyao777 Date: Wed, 6 Apr 2022 08:58:07 +0800 Subject: [PATCH 4/9] sensor_data_processer.cpp Signed-off-by: li-yaoyao777 --- utils/src/report_data_callback.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/utils/src/report_data_callback.cpp b/utils/src/report_data_callback.cpp index fe05c686..3775040b 100644 --- a/utils/src/report_data_callback.cpp +++ b/utils/src/report_data_callback.cpp @@ -64,7 +64,6 @@ int32_t ReportDataCallback::ReportEventCallback(const struct SensorEvent* event, } return ERROR; } -} int32_t leftSize = CIRCULAR_BUF_LEN - cb->eventsBuf_.eventNum; int32_t toEndLen = CIRCULAR_BUF_LEN - cb->eventsBuf_.writePosition; if (leftSize < 0 || toEndLen < 0) { @@ -73,11 +72,11 @@ int32_t ReportDataCallback::ReportEventCallback(const struct SensorEvent* event, return ERROR; } if (toEndLen == 0) { - cb->eventsBuf_.circularBuf[0] = *event; - cb->eventsBuf_.writePosition = 1 - toEndLen; + cb->eventsBuf_.circularBuf[0] = *event; + cb->eventsBuf_.writePosition = 1 - toEndLen; } else { - cb->eventsBuf_.circularBuf[cb->eventsBuf_.writePosition] = *event; - cb->eventsBuf_.writePosition += 1; + cb->eventsBuf_.circularBuf[cb->eventsBuf_.writePosition] = *event; + cb->eventsBuf_.writePosition += 1; } if (leftSize < 1) { cb->eventsBuf_.readPos = cb->eventsBuf_.writePosition; -- Gitee From 67cf79517d213963a1efab0cc20fa2bb1af298cd Mon Sep 17 00:00:00 2001 From: li-yaoyao777 Date: Wed, 6 Apr 2022 15:14:32 +0800 Subject: [PATCH 5/9] sensor_data_processer.cpp Signed-off-by: li-yaoyao777 --- utils/src/report_data_callback.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/utils/src/report_data_callback.cpp b/utils/src/report_data_callback.cpp index 3775040b..d7eae392 100644 --- a/utils/src/report_data_callback.cpp +++ b/utils/src/report_data_callback.cpp @@ -66,9 +66,11 @@ int32_t ReportDataCallback::ReportEventCallback(const struct SensorEvent* event, } int32_t leftSize = CIRCULAR_BUF_LEN - cb->eventsBuf_.eventNum; int32_t toEndLen = CIRCULAR_BUF_LEN - cb->eventsBuf_.writePosition; - if (leftSize < 0 || toEndLen < 0) { - SEN_HILOGE("callback or circularBuf or event cannot be null"); - delete[] event->data; + if (leftSize < 0 || toEndLen < 0){ + SEN_HILOGE("Leftsize and toendlen cannot be less than zero"); + if (event->data != nullptr){ + delete[] event->data; + } return ERROR; } if (toEndLen == 0) { -- Gitee From 64d23a1d50ee11a8cb7461ca63b729bd4b5b58d6 Mon Sep 17 00:00:00 2001 From: li-yaoyao777 Date: Wed, 6 Apr 2022 15:28:00 +0800 Subject: [PATCH 6/9] sensor_data_processer.cpp Signed-off-by: li-yaoyao777 --- utils/src/report_data_callback.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/utils/src/report_data_callback.cpp b/utils/src/report_data_callback.cpp index d7eae392..7fcdd977 100644 --- a/utils/src/report_data_callback.cpp +++ b/utils/src/report_data_callback.cpp @@ -66,9 +66,10 @@ int32_t ReportDataCallback::ReportEventCallback(const struct SensorEvent* event, } int32_t leftSize = CIRCULAR_BUF_LEN - cb->eventsBuf_.eventNum; int32_t toEndLen = CIRCULAR_BUF_LEN - cb->eventsBuf_.writePosition; - if (leftSize < 0 || toEndLen < 0){ + if (leftSize < 0 || toEndLen < 0) + { SEN_HILOGE("Leftsize and toendlen cannot be less than zero"); - if (event->data != nullptr){ + if (event->data != nullptr) { delete[] event->data; } return ERROR; -- Gitee From f0dba9a650aaaa7be43cfe9ebe0ab95f0b0bf6bb Mon Sep 17 00:00:00 2001 From: li-yaoyao777 Date: Wed, 6 Apr 2022 15:35:01 +0800 Subject: [PATCH 7/9] report_data_callback.cpp Signed-off-by: li-yaoyao777 --- utils/src/report_data_callback.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/src/report_data_callback.cpp b/utils/src/report_data_callback.cpp index 7fcdd977..73b589ff 100644 --- a/utils/src/report_data_callback.cpp +++ b/utils/src/report_data_callback.cpp @@ -59,18 +59,18 @@ int32_t ReportDataCallback::ReportEventCallback(const struct SensorEvent* event, } if (cb == nullptr || cb->eventsBuf_.circularBuf == nullptr) { SEN_HILOGE("callback or circularBuf or event cannot be null"); - if (event->data != nullptr) { + if (event->data != nullptr){ delete[] event->data; } return ERROR; } int32_t leftSize = CIRCULAR_BUF_LEN - cb->eventsBuf_.eventNum; int32_t toEndLen = CIRCULAR_BUF_LEN - cb->eventsBuf_.writePosition; - if (leftSize < 0 || toEndLen < 0) - { - SEN_HILOGE("Leftsize and toendlen cannot be less than zero"); + if (leftSize < 0 || toEndLen < 0) { + HiLog::Error(LABEL, "%{public}s callback or circularBuf or event cannot be null", __func__); if (event->data != nullptr) { delete[] event->data; + event->data = nullptr; } return ERROR; } -- Gitee From 5d362871dbebdc28f8a8e277839fc52b4a1a1367 Mon Sep 17 00:00:00 2001 From: li-yaoyao777 Date: Wed, 6 Apr 2022 15:37:17 +0800 Subject: [PATCH 8/9] report_data_callback.cpp Signed-off-by: li-yaoyao777 --- utils/src/report_data_callback.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/src/report_data_callback.cpp b/utils/src/report_data_callback.cpp index 73b589ff..d2451bb1 100644 --- a/utils/src/report_data_callback.cpp +++ b/utils/src/report_data_callback.cpp @@ -67,7 +67,7 @@ int32_t ReportDataCallback::ReportEventCallback(const struct SensorEvent* event, int32_t leftSize = CIRCULAR_BUF_LEN - cb->eventsBuf_.eventNum; int32_t toEndLen = CIRCULAR_BUF_LEN - cb->eventsBuf_.writePosition; if (leftSize < 0 || toEndLen < 0) { - HiLog::Error(LABEL, "%{public}s callback or circularBuf or event cannot be null", __func__); + SEN_HILOGE("Leftsize and toendlen cannot be less than zero"); if (event->data != nullptr) { delete[] event->data; event->data = nullptr; -- Gitee From 173545878d8a3bd9594787ddb7d5764a38b69c1e Mon Sep 17 00:00:00 2001 From: li-yaoyao777 Date: Wed, 6 Apr 2022 15:42:21 +0800 Subject: [PATCH 9/9] report_data_callback.cpp Signed-off-by: li-yaoyao777 --- utils/src/report_data_callback.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/utils/src/report_data_callback.cpp b/utils/src/report_data_callback.cpp index d2451bb1..425266e0 100644 --- a/utils/src/report_data_callback.cpp +++ b/utils/src/report_data_callback.cpp @@ -59,7 +59,7 @@ int32_t ReportDataCallback::ReportEventCallback(const struct SensorEvent* event, } if (cb == nullptr || cb->eventsBuf_.circularBuf == nullptr) { SEN_HILOGE("callback or circularBuf or event cannot be null"); - if (event->data != nullptr){ + if (event->data != nullptr) { delete[] event->data; } return ERROR; @@ -70,7 +70,6 @@ int32_t ReportDataCallback::ReportEventCallback(const struct SensorEvent* event, SEN_HILOGE("Leftsize and toendlen cannot be less than zero"); if (event->data != nullptr) { delete[] event->data; - event->data = nullptr; } return ERROR; } -- Gitee