Imagelibrary/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-12-27 01:28:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

[smart] fix possible memory leak (#7832)

Browse Source 
Signed-off-by: Shell <smokewood@qq.com>
This commit is contained in:
Shell
2023-07-22 10:30:29 +08:00
committed by GitHub
parent f52095d228
commit 52d3637fba
3 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
components/libc/compilers/common/ctime.c
View File

@@ -709,9 +709,11 @@ struct timer_obj
rt_uint32_t status;
int sigev_signo;
clockid_t clockid;
timer_t timer_id;
#ifdef RT_USING_SMART
pid_t pid;
struct rt_work *work;
rt_list_t lwp_node;
#endif
};
@@ -759,6 +761,17 @@ static void _lwp_timer_event_from_pid(struct rt_work *work, void *param)
rt_free(work);
}
int timer_list_free(rt_list_t *timer_list)
{
struct timer_obj *pos, *n;
rt_list_for_each_entry_safe(pos, n, timer_list, lwp_node)
{
timer_delete(pos->timer_id);
}
return 0;
}
#endif /* RT_USING_SMART */
static void rtthread_timer_wrapper(void *timerobj)
@@ -877,6 +890,7 @@ int timer_create(clockid_t clockid, struct sigevent *evp, timer_t *timerid)
if (lwp)
{
timer->pid = lwp_self()->pid;
rt_list_insert_after(&lwp->timer, &timer->lwp_node);
}
else
{
@@ -903,6 +917,8 @@ int timer_create(clockid_t clockid, struct sigevent *evp, timer_t *timerid)
return -1; /* todo:memory leak */
}
_g_timerid[_timerid] = timer;
timer->timer_id = (timer_t)(rt_ubase_t)_timerid;
*timerid = (timer_t)(rt_ubase_t)_timerid;
return 0;
@@ -948,6 +964,11 @@ int timer_delete(timer_t timerid)
}
rt_ktime_hrtimer_detach(&timer->hrtimer);
#ifdef RT_USING_SMART
if (timer->pid)
rt_list_remove(&timer->lwp_node);
#endif
rt_free(timer);
return 0;
}