Add assert check for NULL TCB handle (#1177)
Co-authored-by: ActoryOu <jay2002824@gmail.com>
diff --git a/tasks.c b/tasks.c
index 6d86326..147b1aa 100644
--- a/tasks.c
+++ b/tasks.c
@@ -2203,6 +2203,7 @@
/* If null is passed in here then it is the calling task that is
* being deleted. */
pxTCB = prvGetTCBFromHandle( xTaskToDelete );
+ configASSERT( pxTCB != NULL );
/* Remove task from the ready/delayed list. */
if( uxListRemove( &( pxTCB->xStateListItem ) ) == ( UBaseType_t ) 0 )
@@ -2495,7 +2496,7 @@
traceENTER_eTaskGetState( xTask );
- configASSERT( pxTCB );
+ configASSERT( pxTCB != NULL );
#if ( configNUMBER_OF_CORES == 1 )
if( pxTCB == pxCurrentTCB )
@@ -2628,6 +2629,8 @@
/* If null is passed in here then it is the priority of the task
* that called uxTaskPriorityGet() that is being queried. */
pxTCB = prvGetTCBFromHandle( xTask );
+ configASSERT( pxTCB != NULL );
+
uxReturn = pxTCB->uxPriority;
}
portBASE_TYPE_EXIT_CRITICAL();
@@ -2676,6 +2679,8 @@
/* If null is passed in here then it is the priority of the calling
* task that is being queried. */
pxTCB = prvGetTCBFromHandle( xTask );
+ configASSERT( pxTCB != NULL );
+
uxReturn = pxTCB->uxPriority;
}
taskEXIT_CRITICAL_FROM_ISR( uxSavedInterruptStatus );
@@ -2702,6 +2707,8 @@
/* If null is passed in here then it is the base priority of the task
* that called uxTaskBasePriorityGet() that is being queried. */
pxTCB = prvGetTCBFromHandle( xTask );
+ configASSERT( pxTCB != NULL );
+
uxReturn = pxTCB->uxBasePriority;
}
portBASE_TYPE_EXIT_CRITICAL();
@@ -2750,6 +2757,8 @@
/* If null is passed in here then it is the base priority of the calling
* task that is being queried. */
pxTCB = prvGetTCBFromHandle( xTask );
+ configASSERT( pxTCB != NULL );
+
uxReturn = pxTCB->uxBasePriority;
}
taskEXIT_CRITICAL_FROM_ISR( uxSavedInterruptStatus );
@@ -2794,6 +2803,7 @@
/* If null is passed in here then it is the priority of the calling
* task that is being changed. */
pxTCB = prvGetTCBFromHandle( xTask );
+ configASSERT( pxTCB != NULL );
traceTASK_PRIORITY_SET( pxTCB, uxNewPriority );
@@ -2988,6 +2998,7 @@
taskENTER_CRITICAL();
{
pxTCB = prvGetTCBFromHandle( xTask );
+ configASSERT( pxTCB != NULL );
pxTCB->uxCoreAffinityMask = uxCoreAffinityMask;
@@ -3043,6 +3054,8 @@
portBASE_TYPE_ENTER_CRITICAL();
{
pxTCB = prvGetTCBFromHandle( xTask );
+ configASSERT( pxTCB != NULL );
+
uxCoreAffinityMask = pxTCB->uxCoreAffinityMask;
}
portBASE_TYPE_EXIT_CRITICAL();
@@ -3066,6 +3079,7 @@
taskENTER_CRITICAL();
{
pxTCB = prvGetTCBFromHandle( xTask );
+ configASSERT( pxTCB != NULL );
pxTCB->xPreemptionDisable = pdTRUE;
}
@@ -3089,6 +3103,7 @@
taskENTER_CRITICAL();
{
pxTCB = prvGetTCBFromHandle( xTask );
+ configASSERT( pxTCB != NULL );
pxTCB->xPreemptionDisable = pdFALSE;
@@ -3122,6 +3137,7 @@
/* If null is passed in here then it is the running task that is
* being suspended. */
pxTCB = prvGetTCBFromHandle( xTaskToSuspend );
+ configASSERT( pxTCB != NULL );
traceTASK_SUSPEND( pxTCB );
@@ -4194,7 +4210,7 @@
/* If null is passed in here then the name of the calling task is being
* queried. */
pxTCB = prvGetTCBFromHandle( xTaskToQuery );
- configASSERT( pxTCB );
+ configASSERT( pxTCB != NULL );
traceRETURN_pcTaskGetName( &( pxTCB->pcTaskName[ 0 ] ) );
@@ -4357,6 +4373,7 @@
configASSERT( ppxTaskBuffer != NULL );
pxTCB = prvGetTCBFromHandle( xTask );
+ configASSERT( pxTCB != NULL );
#if ( tskSTATIC_AND_DYNAMIC_ALLOCATION_POSSIBLE == 1 )
{
@@ -4596,7 +4613,7 @@
traceENTER_xTaskAbortDelay( xTask );
- configASSERT( pxTCB );
+ configASSERT( pxTCB != NULL );
vTaskSuspendAll();
{
@@ -4978,6 +4995,7 @@
/* If xTask is NULL then set the calling task's hook. */
pxTCB = prvGetTCBFromHandle( xTask );
+ configASSERT( pxTCB != NULL );
/* Save the hook function in the TCB. A critical section is required as
* the value can be accessed from an interrupt. */
@@ -5007,6 +5025,7 @@
/* If xTask is NULL then set the calling task's hook. */
pxTCB = prvGetTCBFromHandle( xTask );
+ configASSERT( pxTCB != NULL );
/* Save the hook function in the TCB. A critical section is required as
* the value can be accessed from an interrupt. */
@@ -5984,6 +6003,8 @@
( xIndex < ( BaseType_t ) configNUM_THREAD_LOCAL_STORAGE_POINTERS ) )
{
pxTCB = prvGetTCBFromHandle( xTaskToQuery );
+ configASSERT( pxTCB != NULL );
+
pvReturn = pxTCB->pvThreadLocalStoragePointers[ xIndex ];
}
else
@@ -6011,6 +6032,7 @@
/* If null is passed in here then we are modifying the MPU settings of
* the calling task. */
pxTCB = prvGetTCBFromHandle( xTaskToModify );
+ configASSERT( pxTCB != NULL );
vPortStoreTaskMPUSettings( &( pxTCB->xMPUSettings ), pxRegions, NULL, 0 );
@@ -6141,6 +6163,7 @@
/* xTask is NULL then get the state of the calling task. */
pxTCB = prvGetTCBFromHandle( xTask );
+ configASSERT( pxTCB != NULL );
pxTaskStatus->xHandle = pxTCB;
pxTaskStatus->pcTaskName = ( const char * ) &( pxTCB->pcTaskName[ 0 ] );
@@ -6357,6 +6380,7 @@
* type. */
pxTCB = prvGetTCBFromHandle( xTask );
+ configASSERT( pxTCB != NULL );
#if portSTACK_GROWTH < 0
{
@@ -6389,6 +6413,7 @@
traceENTER_uxTaskGetStackHighWaterMark( xTask );
pxTCB = prvGetTCBFromHandle( xTask );
+ configASSERT( pxTCB != NULL );
#if portSTACK_GROWTH < 0
{
@@ -8288,6 +8313,7 @@
/* If null is passed in here then it is the calling task that is having
* its notification state cleared. */
pxTCB = prvGetTCBFromHandle( xTask );
+ configASSERT( pxTCB != NULL );
taskENTER_CRITICAL();
{
@@ -8327,6 +8353,7 @@
/* If null is passed in here then it is the calling task that is having
* its notification state cleared. */
pxTCB = prvGetTCBFromHandle( xTask );
+ configASSERT( pxTCB != NULL );
taskENTER_CRITICAL();
{
@@ -8354,6 +8381,7 @@
traceENTER_ulTaskGetRunTimeCounter( xTask );
pxTCB = prvGetTCBFromHandle( xTask );
+ configASSERT( pxTCB != NULL );
traceRETURN_ulTaskGetRunTimeCounter( pxTCB->ulRunTimeCounter );
@@ -8381,6 +8409,8 @@
if( ulTotalTime > ( configRUN_TIME_COUNTER_TYPE ) 0 )
{
pxTCB = prvGetTCBFromHandle( xTask );
+ configASSERT( pxTCB != NULL );
+
ulReturn = pxTCB->ulRunTimeCounter / ulTotalTime;
}
else
@@ -8584,6 +8614,7 @@
traceENTER_xTaskGetMPUSettings( xTask );
pxTCB = prvGetTCBFromHandle( xTask );
+ configASSERT( pxTCB != NULL );
traceRETURN_xTaskGetMPUSettings( &( pxTCB->xMPUSettings ) );
