Skip to content

Commit

Permalink
Merge branch 'fix/openthread_alarm_timer_overflow_v5.1' into 'release…
Browse files Browse the repository at this point in the history
…/v5.1'

fix(openthread): fix openthread alarm timer calculation remaining_us overflow issue (backport v5.1)

See merge request espressif/esp-idf!29391
  • Loading branch information
chshu committed Mar 5, 2024
2 parents 1f1d2b0 + 6c9a7da commit 1f1d252
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions components/openthread/src/port/esp_openthread_alarm.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ void esp_openthread_alarm_deinit(void)
void esp_openthread_alarm_update(esp_openthread_mainloop_context_t *mainloop)
{
struct timeval *timeout = &mainloop->timeout;
int32_t remain_min_time_us = INT32_MAX;
int32_t remaining_us = 0;
int64_t remain_min_time_us = INT64_MAX;
int64_t remaining_us = 0;
if (s_is_ms_running) {
remaining_us = calculate_duration(s_alarm_ms, otPlatAlarmMilliGetNow()) * US_PER_MS;
if (remain_min_time_us > remaining_us) {
Expand Down

0 comments on commit 1f1d252

Please sign in to comment.