diff --git a/adapter/uhdf2/test/unittest/platform/BUILD.gn b/adapter/uhdf2/test/unittest/platform/BUILD.gn index 0be9109a9406dbcd0cf0e3b83c79688fd9a5aaf8..ceb863f4a9590c7429dccee66d6dd03ff76f2c26 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", diff --git a/framework/support/posix/src/osal_time.c b/framework/support/posix/src/osal_time.c index 34a1b478158290e4ebe8bf2a3ac899533970ca14..fd00e9d4dcf8f5aba0c1bede93c68e0fddeb149f 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;