From abf9d8dcdd380aac67d5f46343c9214483ed0a1c Mon Sep 17 00:00:00 2001 From: huyx Date: Sat, 24 Aug 2024 09:50:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8DUT=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=EF=BC=8Cclock=E6=B5=8B=E8=AF=95=E7=94=A8?= =?UTF-8?q?=E4=BE=8B=E9=BB=98=E8=AE=A4=E4=B8=8D=E5=BC=80=E5=90=AF?= 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 bac6e8f572c08fa609c88a5e6df1ad2f36e171bb Mon Sep 17 00:00:00 2001 From: huyx Date: Sat, 24 Aug 2024 15:40:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/support/posix/src/osal_time.c b/framework/support/posix/src/osal_time.c index 34a1b4781..fd00e9d4d 100644 --- a/framework/support/posix/src/osal_time.c +++ b/framework/support/posix/src/osal_time.c @@ -52,7 +52,7 @@ int32_t OsalDiffTime(const OsalTimespec *start, const OsalTimespec *end, OsalTim sec = 1; } - if ((start->sec + sec > UINT64_MAX) || (usec + end->usec > UINT64_MAX) || + 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; -- Gitee