Merge branch 'bugfix/freertos_prvTaskIsTaskSuspended' into 'master'

Dazza0 · Dazza0 · commit a1a125ec85a6 · 2021-10-23T07:08:21.000Z
freertos: Fix prvTaskIsTaskSuspended check

Closes IDFGH-5865

See merge request espressif/esp-idf!15369
diff --git a/components/freertos/tasks.c b/components/freertos/tasks.c
@@ -2093,7 +2093,7 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB,
         if( listIS_CONTAINED_WITHIN( &xSuspendedTaskList, &( pxTCB->xStateListItem ) ) != pdFALSE )
         {
             /* Has the task already been resumed from within an ISR? */
-            if( listIS_CONTAINED_WITHIN( &xPendingReadyList[xPortGetCoreID()], &( pxTCB->xEventListItem )) ||
+            if( listIS_CONTAINED_WITHIN( &xPendingReadyList[xPortGetCoreID()], &( pxTCB->xEventListItem )) == pdFALSE &&
                 listIS_CONTAINED_WITHIN( &xPendingReadyList[!xPortGetCoreID()], &( pxTCB->xEventListItem ))  == pdFALSE )
             {
                 /* Is it in the suspended list because it is in the Suspended

Original file line number	Diff line number	Diff line change
`@@ -2093,7 +2093,7 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB,`
`2093`	`2093`	`if( listIS_CONTAINED_WITHIN( &xSuspendedTaskList, &( pxTCB->xStateListItem ) ) != pdFALSE )`
`2094`	`2094`	`{`
`2095`	`2095`	`/* Has the task already been resumed from within an ISR? */`
`2096`		`- if( listIS_CONTAINED_WITHIN( &xPendingReadyList[xPortGetCoreID()], &( pxTCB->xEventListItem )) \|\|`
	`2096`	`+ if( listIS_CONTAINED_WITHIN( &xPendingReadyList[xPortGetCoreID()], &( pxTCB->xEventListItem )) == pdFALSE &&`
`2097`	`2097`	`listIS_CONTAINED_WITHIN( &xPendingReadyList[!xPortGetCoreID()], &( pxTCB->xEventListItem )) == pdFALSE )`
`2098`	`2098`	`{`
`2099`	`2099`	`/* Is it in the suspended list because it is in the Suspended`