Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-28 03:45:50 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

sched: fix pthread_exit crash

Browse Source 
A normal user task calls pthread_exit(), will crash at DEBUGASSERT.
Cause pthread_exit limit in user pthread task.

test case:
int main(int argc, FAR char *argv[])
{
  pthread_exit(NULL);
  return 0;
}
>> test
>> echo $?
>> 0

Signed-off-by: fangxinyong <fangxinyong@xiaomi.com>
This commit is contained in:
fangxinyong
2023-06-23 22:19:56 +08:00
committed by Xiang Xiao
parent 1d6e51220d
commit d08b81db9d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sched/pthread/pthread_completejoin.c
+4 -1
View File
@@ -203,7 +203,10 @@ int pthread_completejoin(pid_t pid, FAR void *exit_value)
if (ret != OK) if (ret != OK)
{ {
nxmutex_unlock(&group->tg_joinlock); nxmutex_unlock(&group->tg_joinlock);
return tcb->flags & TCB_FLAG_DETACHED ? OK : ERROR;
return ((tcb->flags & TCB_FLAG_DETACHED) ||
(tcb->flags & TCB_FLAG_TTYPE_MASK) != TCB_FLAG_TTYPE_PTHREAD) ?
OK : ERROR;
} }
else else
{ {
sched/pthread/pthread_exit.c
-1
View File
@@ -69,7 +69,6 @@ void nx_pthread_exit(FAR void *exit_value)
sinfo("exit_value=%p\n", exit_value); sinfo("exit_value=%p\n", exit_value);
DEBUGASSERT(tcb != NULL); DEBUGASSERT(tcb != NULL);
DEBUGASSERT((tcb->flags & TCB_FLAG_TTYPE_MASK) == TCB_FLAG_TTYPE_PTHREAD);
/* Block any signal actions that would awaken us while were /* Block any signal actions that would awaken us while were
* are performing the JOIN handshake. * are performing the JOIN handshake.