From 838ff4f832737f21dc192dde526e8f29f20bd7f1 Mon Sep 17 00:00:00 2001 From: Jesus Velazquez Date: Wed, 28 Oct 2020 11:52:37 -0700 Subject: [PATCH] bl_sys_time.c: adds null pointer checks and extra spaces cleanup Signed-off-by: Jesus Velazquez --- components/sys/bltime/bl_sys_time.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/components/sys/bltime/bl_sys_time.c b/components/sys/bltime/bl_sys_time.c index ffad8c58..144ea3f9 100644 --- a/components/sys/bltime/bl_sys_time.c +++ b/components/sys/bltime/bl_sys_time.c @@ -49,6 +49,10 @@ int bl_sys_time_get(uint64_t *epoch) { int ms_diff; + if (!epoch) { + return -1; + } + if (0 == epoch_time) { return -1; } @@ -66,7 +70,7 @@ void bl_sys_time_sync_init(void) init_tick_rtos = xTaskGetTickCount(); init_tick_rtc = bl_rtc_get_timestamp_ms() & 0xFFFFFFFF; taskEXIT_CRITICAL(); - + sync_init = 1; } @@ -76,19 +80,23 @@ int bl_sys_time_sync_state(uint32_t *xTicksToJump) uint32_t currTickRtc; uint32_t deltaTickRtos; uint32_t deltaTickRtc; - + + if (!xTicksToJump) { + return -1; + } + if(!sync_init){ return -1; } - + taskENTER_CRITICAL(); currTickRtos = xTaskGetTickCount(); currTickRtc = bl_rtc_get_timestamp_ms() & 0xFFFFFFFF; taskEXIT_CRITICAL(); - + deltaTickRtos = currTickRtos - init_tick_rtos; deltaTickRtc = currTickRtc - init_tick_rtc; - + if(deltaTickRtc > deltaTickRtos){ *xTicksToJump = deltaTickRtc - deltaTickRtos; return 1; @@ -100,10 +108,10 @@ int bl_sys_time_sync_state(uint32_t *xTicksToJump) uint32_t bl_sys_time_sync(void) { uint32_t xTicksToJump = 0; - + if(bl_sys_time_sync_state(&xTicksToJump) > 0){ vTaskStepTickSafe(xTicksToJump); } - + return xTicksToJump; }