Skip to content

Commit 7fb79b0

Browse files
committed
- Fix to defend against double event deletion, that could cause
event corruption and use after free, for comm_timer_disable.
1 parent 8ee0bca commit 7fb79b0

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

doc/Changelog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
21 August 2026: Wouter
2+
- Fix to defend against double event deletion, that could cause
3+
event corruption and use after free, for comm_timer_disable.
4+
15
11 August 2026: Wouter
26
- Fix #1492 from zacek: Data race in log_init() on
37
key_created/log_lock when calling ub_ctx_create()

util/netevent.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7036,8 +7036,12 @@ comm_timer_disable(struct comm_timer* timer)
70367036
{
70377037
if(!timer)
70387038
return;
7039-
ub_timer_del(timer->ev_timer->ev);
7040-
timer->ev_timer->enabled = 0;
7039+
/* The event backend can not always deal with event del if it was not
7040+
* added before. For that, there is a check if it was added here.*/
7041+
if(timer->ev_timer->enabled) {
7042+
ub_timer_del(timer->ev_timer->ev);
7043+
timer->ev_timer->enabled = 0;
7044+
}
70417045
}
70427046

70437047
void

0 commit comments

Comments
 (0)