sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sched/task/task_exithook.c: Clear atexit() function pointer before calling it. On most archs, up_assert() calls exit() so without this change, if atexit() function triggers an assertion we are in endless loop.

Browse Source
This commit is contained in:
Juha Niskanen 2017-11-30 06:41:57 -06:00 committed by Gregory Nutt
parent 97434ac5e5
commit e8ee632378
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sched/task/task_exithook.c
View File

@ -98,25 +98,31 @@ static inline void task_atexit(FAR struct tcb_s *tcb)
{
if (group->tg_atexitfunc[index])
{
/* Call the atexit function */
(*group->tg_atexitfunc[index])();
atexitfunc_t func;
/* Nullify the atexit function to prevent its reuse. */
func = group->tg_atexitfunc[index];
group->tg_atexitfunc[index] = NULL;
/* Call the atexit function */
(*func)();
}
}
#else
if (group->tg_atexitfunc)
{
/* Call the atexit function */
(*group->tg_atexitfunc)();
atexitfunc_t func;
/* Nullify the atexit function to prevent its reuse. */
func = group->tg_atexitfunc;
group->tg_atexitfunc = NULL;
/* Call the atexit function */
(*func)();
}
#endif
}
@ -166,25 +172,31 @@ static inline void task_onexit(FAR struct tcb_s *tcb, int status)
{
if (group->tg_onexitfunc[index])
{
/* Call the on_exit function */
(*group->tg_onexitfunc[index])(status, group->tg_onexitarg[index]);
onexitfunc_t func;
/* Nullify the on_exit function to prevent its reuse. */
func = group->tg_onexitfunc[index];
group->tg_onexitfunc[index] = NULL;
/* Call the on_exit function */
(*func)(status, group->tg_onexitarg[index]);
}
}
#else
if (group->tg_onexitfunc)
{
/* Call the on_exit function */
(*group->tg_onexitfunc)(status, group->tg_onexitarg);
onexitfunc_t func;
/* Nullify the on_exit function to prevent its reuse. */
func = group->tg_onexitfunc;
group->tg_onexitfunc = NULL;
/* Call the on_exit function */
(*func)(status, group->tg_onexitarg);
}
#endif
}