summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nuttx/ChangeLog4
-rw-r--r--nuttx/sched/sched_releasetcb.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 74df4b44e..614b9b89f 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -5896,4 +5896,8 @@
Mikrow STM32F4 board from Ken Pettit (2013-10-27).
* arch/arm/src/stm32/stm32_spi.c: DMA-related fixe from Ken
Pettit (2013-10-27).
+ * sched/sched_releasetcb.c: Fix a cornercase: If sched_releasetcb()
+ is called as part of a failed pthread startup before the flags
+ field in the TCB has been initialized, then a crash occurs.
+ Pointed out by David Sidrane (2013-10-27)
diff --git a/nuttx/sched/sched_releasetcb.c b/nuttx/sched/sched_releasetcb.c
index aefc5264d..b0605ef3b 100644
--- a/nuttx/sched/sched_releasetcb.c
+++ b/nuttx/sched/sched_releasetcb.c
@@ -168,7 +168,7 @@ int sched_releasetcb(FAR struct tcb_s *tcb, uint8_t ttype)
*/
#ifndef CONFIG_DISABLE_PTHREAD
- if ((tcb->flags & TCB_FLAG_TTYPE_MASK) != TCB_FLAG_TTYPE_PTHREAD)
+ if (ttype != TCB_FLAG_TTYPE_PTHREAD)
#endif
{
FAR struct task_tcb_s *ttcb = (FAR struct task_tcb_s *)tcb;