GithubStar/neuron
1
0
Fork 0
mirror of https://github.com/emqx/neuron.git synced 2026-10-21 00:36:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1553 from fengzeroz/main

Browse Source 
fix(timer): use after free
This commit is contained in:
fengzeroz
2023-09-22 11:31:11 +08:00
committed by GitHub
parent 9efaf26dd1 36b201879a
commit 5ca91e1ffb
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/event/event_linux.c
+5 -4
View File
@@ -106,25 +106,24 @@ static void *event_loop(void *arg)
if ((event.events & EPOLLIN) == EPOLLIN) {
uint64_t t;
nng_mtx_lock(data->ctx.timer->mtx);
ssize_t size = read(data->fd, &t, sizeof(t));
(void) size;
if (!data->ctx.timer->stop) {
if (data->ctx.timer->type == NEU_EVENT_TIMER_BLOCK) {
nng_mtx_lock(data->ctx.timer->mtx);
epoll_ctl(epoll_fd, EPOLL_CTL_DEL, data->fd, NULL);
ret = data->callback.timer(data->usr_data);
timerfd_settime(data->fd, 0, &data->ctx.timer->value,
NULL);
epoll_ctl(epoll_fd, EPOLL_CTL_ADD, data->fd, &event);
nng_mtx_unlock(data->ctx.timer->mtx);
} else {
nng_mtx_lock(data->ctx.timer->mtx);
ret = data->callback.timer(data->usr_data);
nng_mtx_unlock(data->ctx.timer->mtx);
}
}
nng_mtx_unlock(data->ctx.timer->mtx);
}
break;
case IO:
if ((event.events & EPOLLHUP) == EPOLLHUP) {
@@ -221,6 +220,7 @@ int neu_event_del_timer(neu_events_t *events, neu_event_timer_t *timer)
events->epoll_fd);
timer->stop = true;
nng_mtx_lock(timer->mtx);
close(timer->fd);
epoll_ctl(events->epoll_fd, EPOLL_CTL_DEL, timer->fd, NULL);
@@ -229,6 +229,7 @@ int neu_event_del_timer(neu_events_t *events, neu_event_timer_t *timer)
nng_mtx_free(timer->mtx);
free(timer);
return 0;
}