Skip to content

su_timer: skip an expired timer with no callback instead of aborting #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
garacil wants to merge 1 commit into
base: master
Choose a base branch
from
Open

su_timer: skip an expired timer with no callback instead of aborting #334

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion libsofia-sip-ua/su/su_timer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,17 @@ int su_timer_expire(su_timer_queue_t * const timers,
timers_remove(timers[0], 1);

f = t->sut_wakeup; t->sut_wakeup = NULL;
assert(f);
if (!f) {
/* A set timer reached expiry with no callback (a stale/racy entry, e.g.
* a concurrent su_timer_reset, or an invalidly-set timer). There is
* nothing valid to call, so mark it not-running and skip it rather than
* aborting the process (this was an assert(f)). */
SU_DEBUG_3(("su_timer_expire: timer %p expired with no callback, skipping\n",
(void *)t));
t->sut_running = reset;
t->sut_arg = NULL;
continue;
}

if (t->sut_running == run_at_intervals) {
while (t->sut_running == run_at_intervals &&
Expand Down