From 88d41bdedea3e7b9623a1b068d4d73496ffd4b79 Mon Sep 17 00:00:00 2001 From: huyx Date: Wed, 21 Aug 2024 17:41:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=8D=E6=89=A7?= =?UTF-8?q?=E8=A1=8Chdf=5Fclock=5Ftest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huyx --- adapter/uhdf2/test/unittest/platform/BUILD.gn | 2 -- 1 file changed, 2 deletions(-) diff --git a/adapter/uhdf2/test/unittest/platform/BUILD.gn b/adapter/uhdf2/test/unittest/platform/BUILD.gn index 0be9109a9..ceb863f4a 100644 --- a/adapter/uhdf2/test/unittest/platform/BUILD.gn +++ b/adapter/uhdf2/test/unittest/platform/BUILD.gn @@ -33,14 +33,12 @@ ohos_unittest("hdf_adapter_uhdf_test_platform") { defines = [ "__USER__" ] sources = [ "$hdf_framework_path/support/platform/test/unittest/common/hdf_adc_test.cpp", - "$hdf_framework_path/support/platform/test/unittest/common/hdf_clock_test.cpp", "$hdf_framework_path/support/platform/test/unittest/common/hdf_gpio_test.cpp", "$hdf_framework_path/support/platform/test/unittest/common/hdf_i2c_test.cpp", "$hdf_framework_path/support/platform/test/unittest/common/hdf_pwm_test.cpp", "$hdf_framework_path/support/platform/test/unittest/common/hdf_rtc_test.cpp", "$hdf_framework_path/support/platform/test/unittest/common/hdf_uart_test.cpp", "$hdf_framework_path/test/unittest/platform/common/adc_test.c", - "$hdf_framework_path/test/unittest/platform/common/clock_test.c", "$hdf_framework_path/test/unittest/platform/common/gpio_test.c", "$hdf_framework_path/test/unittest/platform/common/i2c_test.c", "$hdf_framework_path/test/unittest/platform/common/pwm_test.c", -- Gitee From 9b83230094a3c8b32785c9b8f689eef4862d884a Mon Sep 17 00:00:00 2001 From: huyx Date: Sat, 24 Aug 2024 16:20:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huyx --- framework/support/posix/src/osal_time.c | 5 +++-- interfaces/inner_api/hdi/base/hdi_smq.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/framework/support/posix/src/osal_time.c b/framework/support/posix/src/osal_time.c index 67c386a1e..fd00e9d4d 100644 --- a/framework/support/posix/src/osal_time.c +++ b/framework/support/posix/src/osal_time.c @@ -42,7 +42,7 @@ int32_t OsalDiffTime(const OsalTimespec *start, const OsalTimespec *end, OsalTim return HDF_ERR_INVALID_PARAM; } - if (start->sec > end->sec) { + if ((start->sec > end->sec) || ((end->sec == start->sec) && (end->usec < start->usec))) { HDF_LOGE("%s start time later then end time", __func__); return HDF_ERR_INVALID_PARAM; } @@ -52,7 +52,8 @@ int32_t OsalDiffTime(const OsalTimespec *start, const OsalTimespec *end, OsalTim sec = 1; } - if (end->sec - start->sec - sec < 0 || end->sec > UINT64_MAX - sec - start->sec) { + if ((start->sec > UINT64_MAX - sec) || (end->usec > UINT64_MAX - usec) || + (end->sec < start->sec + sec) || (end->usec + usec < start->usec)) { HDF_LOGE("%s end time invalid", __func__); return HDF_ERR_INVALID_PARAM; } diff --git a/interfaces/inner_api/hdi/base/hdi_smq.h b/interfaces/inner_api/hdi/base/hdi_smq.h index ecdc37ee7..e10e62e6c 100644 --- a/interfaces/inner_api/hdi/base/hdi_smq.h +++ b/interfaces/inner_api/hdi/base/hdi_smq.h @@ -401,7 +401,7 @@ bool SharedMemQueue::IsGood() template size_t SharedMemQueue::Align(size_t num, size_t alignSize) { - if ((num + alignSize) < 1 || num > (SIZE_MAX - alignSize) || alignSize > (SIZE_MAX - num)) { + if (alignSize < 1 || num > (SIZE_MAX - alignSize)) { HDF_LOGE("Invalid parameter num or alignSize"); return 0; } -- Gitee From 40f8446a7bdaa75da402d653689f2dff83e3b319 Mon Sep 17 00:00:00 2001 From: huyx Date: Thu, 29 Aug 2024 10:01:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=BB=84=E8=93=9Drelease=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huyx --- framework/core/manager/src/devmgr_service.c | 4 ++++ framework/tools/hdi-gen/util/string_builder.cpp | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/framework/core/manager/src/devmgr_service.c b/framework/core/manager/src/devmgr_service.c index 902ce8f54..e5d115b48 100644 --- a/framework/core/manager/src/devmgr_service.c +++ b/framework/core/manager/src/devmgr_service.c @@ -450,6 +450,10 @@ int DevmgrServicePowerStateChange(struct IDevmgrService *devmgrService, enum Hdf bool DevmgrServiceConstruct(struct DevmgrService *inst) { + if (inst == NULL) { + HDF_LOGE("%{public}s:inst is null ", __func__); + return false; + } struct IDevmgrService *devMgrSvcIf = NULL; if (OsalMutexInit(&inst->devMgrMutex) != HDF_SUCCESS) { HDF_LOGE("%{public}s:failed to mutex init ", __func__); diff --git a/framework/tools/hdi-gen/util/string_builder.cpp b/framework/tools/hdi-gen/util/string_builder.cpp index 73fec49a9..ab3cb557e 100644 --- a/framework/tools/hdi-gen/util/string_builder.cpp +++ b/framework/tools/hdi-gen/util/string_builder.cpp @@ -33,6 +33,10 @@ StringBuilder &StringBuilder::Append(char c) } } + if (buffer_ == nullptr) { + Logger::E(TAG, "buffer_ is nullptr!"); + return *this; + } buffer_[position_] = c; position_ += 1; return *this; @@ -146,12 +150,12 @@ bool StringBuilder::Grow(size_t size) if (buffer_ != nullptr) { int ret = memcpy_s(newBuffer, newSize, buffer_, capacity_); - free(buffer_); if (ret != 0) { Logger::E(TAG, "memcpy_s error ret = %d!", ret); free(newBuffer); return false; } + free(buffer_); } buffer_ = newBuffer; capacity_ = newSize; @@ -160,6 +164,10 @@ bool StringBuilder::Grow(size_t size) std::string StringBuilder::ToString() const { + if (buffer_ == nullptr) { + Logger::E(TAG, "buffer_ is nullptr"); + return ""; + } return std::string(buffer_, position_); } } // namespace HDI -- Gitee