Fix false positive array-bounds warning

tony-josi-aws · tony-josi-aws · commit 43d98816c4a3 · 2025-01-27T12:35:10.000+05:30
diff --git a/source/FreeRTOS_DNS_Callback.c b/source/FreeRTOS_DNS_Callback.c
@@ -58,7 +58,7 @@
     {
         BaseType_t xResult = pdFALSE;
         const ListItem_t * pxIterator;
-        const ListItem_t * xEnd = listGET_END_MARKER( &xCallbackList );
+        const ListItem_t * pxEnd = listGET_END_MARKER( &xCallbackList );
         TickType_t uxIdentifier = ( TickType_t ) pxSet->pxDNSMessageHeader->usIdentifier;
 
         /* While iterating through the list, the scheduler is suspended.
@@ -69,8 +69,8 @@
 
         vTaskSuspendAll();
         {
-            for( pxIterator = ( const ListItem_t * ) listGET_NEXT( xEnd );
-                 pxIterator != ( const ListItem_t * ) xEnd;
+            for( pxIterator = ( const ListItem_t * ) listGET_HEAD_ENTRY( &xCallbackList );
+                 pxIterator != ( const ListItem_t * ) pxEnd;
                  pxIterator = ( const ListItem_t * ) listGET_NEXT( pxIterator ) )
             {
                 BaseType_t xMatching;
@@ -194,7 +194,7 @@
     void vDNSCheckCallBack( void * pvSearchID )
     {
         const ListItem_t * pxIterator;
-        const ListItem_t * xEnd = listGET_END_MARKER( &xCallbackList );
+        const ListItem_t * pxEnd = listGET_END_MARKER( &xCallbackList );
 
         /* When a DNS-search times out, the call-back function shall
          * be called. Store theses item in a temporary list.
@@ -206,8 +206,8 @@
 
         vTaskSuspendAll();
         {
-            for( pxIterator = ( const ListItem_t * ) listGET_NEXT( xEnd );
-                 pxIterator != xEnd; )
+            for( pxIterator = ( const ListItem_t * ) listGET_HEAD_ENTRY( &xCallbackList );
+                 pxIterator != pxEnd; )
             {
                 DNSCallback_t * pxCallback = ( ( DNSCallback_t * ) listGET_LIST_ITEM_OWNER( pxIterator ) );
                 /* Move to the next item because we might remove this item */
@@ -239,10 +239,10 @@
         if( listLIST_IS_EMPTY( &xTempList ) == pdFALSE )
         {
             /* There is at least one item in xTempList which must be removed and deleted. */
-            xEnd = listGET_END_MARKER( &xTempList );
+            pxEnd = listGET_END_MARKER( &xTempList );
 
-            for( pxIterator = ( const ListItem_t * ) listGET_NEXT( xEnd );
-                 pxIterator != xEnd;
+            for( pxIterator = ( const ListItem_t * ) listGET_HEAD_ENTRY( &xTempList );
+                 pxIterator != pxEnd;
                  )
             {
                 DNSCallback_t * pxCallback = ( ( DNSCallback_t * ) listGET_LIST_ITEM_OWNER( pxIterator ) );
diff --git a/source/FreeRTOS_Sockets.c b/source/FreeRTOS_Sockets.c
@@ -2285,7 +2285,7 @@ void * vSocketClose( FreeRTOS_Socket_t * pxSocket )
 
         if( pxSocketToDelete->u.xTCP.eTCPState == eTCP_LISTEN )
         {
-            pxIterator = listGET_NEXT( pxEnd );
+            pxIterator = listGET_HEAD_ENTRY( &xBoundTCPSocketsList );
 
             while( pxIterator != pxEnd )
             {
@@ -2309,7 +2309,7 @@ void * vSocketClose( FreeRTOS_Socket_t * pxSocket )
         }
         else
         {
-            for( pxIterator = listGET_NEXT( pxEnd );
+            for( pxIterator = listGET_HEAD_ENTRY( &xBoundTCPSocketsList );
                  pxIterator != pxEnd;
                  pxIterator = listGET_NEXT( pxIterator ) )
             {
@@ -3054,7 +3054,7 @@ static const ListItem_t * pxListFindListItemWithValue( const List_t * pxList,
         /* coverity[misra_c_2012_rule_11_3_violation] */
         const ListItem_t * pxEnd = ( ( const ListItem_t * ) &( pxList->xListEnd ) );
 
-        for( pxIterator = listGET_NEXT( pxEnd );
+        for( pxIterator = listGET_HEAD_ENTRY( pxList );
              pxIterator != pxEnd;
              pxIterator = listGET_NEXT( pxIterator ) )
         {
@@ -4961,7 +4961,7 @@ void vSocketWakeUpUser( FreeRTOS_Socket_t * pxSocket )
 
         ( void ) ulLocalIP;
 
-        for( pxIterator = listGET_NEXT( pxEnd );
+        for( pxIterator = listGET_HEAD_ENTRY( &xBoundTCPSocketsList );
              pxIterator != pxEnd;
              pxIterator = listGET_NEXT( pxIterator ) )
         {
@@ -6085,13 +6085,15 @@ BaseType_t FreeRTOS_GetIPType( ConstSocket_t xSocket )
         {
             const ListItem_t * pxIterator;
             const ListItem_t * pxEnd;
+            const List_t * pxList;
 
             if( xRound == 0 )
             {
                 /* MISRA Ref 11.3.1 [Misaligned access] */
                 /* More details at: https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/main/MISRA.md#rule-113 */
                 /* coverity[misra_c_2012_rule_11_3_violation] */
                 pxEnd = ( ( const ListItem_t * ) &( xBoundUDPSocketsList.xListEnd ) );
+                pxList = &xBoundUDPSocketsList;
             }
 
             #if ipconfigUSE_TCP == 1
@@ -6101,10 +6103,11 @@ BaseType_t FreeRTOS_GetIPType( ConstSocket_t xSocket )
                     /* More details at: https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/main/MISRA.md#rule-113 */
                     /* coverity[misra_c_2012_rule_11_3_violation] */
                     pxEnd = ( ( const ListItem_t * ) &( xBoundTCPSocketsList.xListEnd ) );
+                    pxList = &xBoundTCPSocketsList;
                 }
             #endif /* ipconfigUSE_TCP == 1 */
 
-            for( pxIterator = listGET_NEXT( pxEnd );
+            for( pxIterator = listGET_HEAD_ENTRY( pxList );
                  pxIterator != pxEnd;
                  pxIterator = listGET_NEXT( pxIterator ) )
             {

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@`
`58`	`58`	`{`
`59`	`59`	`BaseType_t xResult = pdFALSE;`
`60`	`60`	`const ListItem_t * pxIterator;`
`61`		`- const ListItem_t * xEnd = listGET_END_MARKER( &xCallbackList );`
	`61`	`+ const ListItem_t * pxEnd = listGET_END_MARKER( &xCallbackList );`
`62`	`62`	`TickType_t uxIdentifier = ( TickType_t ) pxSet->pxDNSMessageHeader->usIdentifier;`
`63`	`63`
`64`	`64`	`/* While iterating through the list, the scheduler is suspended.`
`@@ -69,8 +69,8 @@`
`69`	`69`
`70`	`70`	`vTaskSuspendAll();`
`71`	`71`	`{`
`72`		`- for( pxIterator = ( const ListItem_t * ) listGET_NEXT( xEnd );`
`73`		`- pxIterator != ( const ListItem_t * ) xEnd;`
	`72`	`+ for( pxIterator = ( const ListItem_t * ) listGET_HEAD_ENTRY( &xCallbackList );`
	`73`	`+ pxIterator != ( const ListItem_t * ) pxEnd;`
`74`	`74`	`pxIterator = ( const ListItem_t * ) listGET_NEXT( pxIterator ) )`
`75`	`75`	`{`
`76`	`76`	`BaseType_t xMatching;`
`@@ -194,7 +194,7 @@`
`194`	`194`	`void vDNSCheckCallBack( void * pvSearchID )`
`195`	`195`	`{`
`196`	`196`	`const ListItem_t * pxIterator;`
`197`		`- const ListItem_t * xEnd = listGET_END_MARKER( &xCallbackList );`
	`197`	`+ const ListItem_t * pxEnd = listGET_END_MARKER( &xCallbackList );`
`198`	`198`
`199`	`199`	`/* When a DNS-search times out, the call-back function shall`
`200`	`200`	`* be called. Store theses item in a temporary list.`
`@@ -206,8 +206,8 @@`
`206`	`206`
`207`	`207`	`vTaskSuspendAll();`
`208`	`208`	`{`
`209`		`- for( pxIterator = ( const ListItem_t * ) listGET_NEXT( xEnd );`
`210`		`- pxIterator != xEnd; )`
	`209`	`+ for( pxIterator = ( const ListItem_t * ) listGET_HEAD_ENTRY( &xCallbackList );`
	`210`	`+ pxIterator != pxEnd; )`
`211`	`211`	`{`
`212`	`212`	`DNSCallback_t * pxCallback = ( ( DNSCallback_t * ) listGET_LIST_ITEM_OWNER( pxIterator ) );`
`213`	`213`	`/* Move to the next item because we might remove this item */`
`@@ -239,10 +239,10 @@`
`239`	`239`	`if( listLIST_IS_EMPTY( &xTempList ) == pdFALSE )`
`240`	`240`	`{`
`241`	`241`	`/* There is at least one item in xTempList which must be removed and deleted. */`
`242`		`- xEnd = listGET_END_MARKER( &xTempList );`
	`242`	`+ pxEnd = listGET_END_MARKER( &xTempList );`
`243`	`243`
`244`		`- for( pxIterator = ( const ListItem_t * ) listGET_NEXT( xEnd );`
`245`		`- pxIterator != xEnd;`
	`244`	`+ for( pxIterator = ( const ListItem_t * ) listGET_HEAD_ENTRY( &xTempList );`
	`245`	`+ pxIterator != pxEnd;`
`246`	`246`	`)`
`247`	`247`	`{`
`248`	`248`	`DNSCallback_t * pxCallback = ( ( DNSCallback_t * ) listGET_LIST_ITEM_OWNER( pxIterator ) );`
Original file line number	Diff line number	Diff line change
`@@ -2285,7 +2285,7 @@ void * vSocketClose( FreeRTOS_Socket_t * pxSocket )`
`2285`	`2285`
`2286`	`2286`	`if( pxSocketToDelete->u.xTCP.eTCPState == eTCP_LISTEN )`
`2287`	`2287`	`{`
`2288`		`- pxIterator = listGET_NEXT( pxEnd );`
	`2288`	`+ pxIterator = listGET_HEAD_ENTRY( &xBoundTCPSocketsList );`
`2289`	`2289`
`2290`	`2290`	`while( pxIterator != pxEnd )`
`2291`	`2291`	`{`
`@@ -2309,7 +2309,7 @@ void * vSocketClose( FreeRTOS_Socket_t * pxSocket )`
`2309`	`2309`	`}`
`2310`	`2310`	`else`
`2311`	`2311`	`{`
`2312`		`- for( pxIterator = listGET_NEXT( pxEnd );`
	`2312`	`+ for( pxIterator = listGET_HEAD_ENTRY( &xBoundTCPSocketsList );`
`2313`	`2313`	`pxIterator != pxEnd;`
`2314`	`2314`	`pxIterator = listGET_NEXT( pxIterator ) )`
`2315`	`2315`	`{`
`@@ -3054,7 +3054,7 @@ static const ListItem_t * pxListFindListItemWithValue( const List_t * pxList,`
`3054`	`3054`	`/* coverity[misra_c_2012_rule_11_3_violation] */`
`3055`	`3055`	`const ListItem_t * pxEnd = ( ( const ListItem_t * ) &( pxList->xListEnd ) );`
`3056`	`3056`
`3057`		`- for( pxIterator = listGET_NEXT( pxEnd );`
	`3057`	`+ for( pxIterator = listGET_HEAD_ENTRY( pxList );`
`3058`	`3058`	`pxIterator != pxEnd;`
`3059`	`3059`	`pxIterator = listGET_NEXT( pxIterator ) )`
`3060`	`3060`	`{`
`@@ -4961,7 +4961,7 @@ void vSocketWakeUpUser( FreeRTOS_Socket_t * pxSocket )`
`4961`	`4961`
`4962`	`4962`	`( void ) ulLocalIP;`
`4963`	`4963`
`4964`		`- for( pxIterator = listGET_NEXT( pxEnd );`
	`4964`	`+ for( pxIterator = listGET_HEAD_ENTRY( &xBoundTCPSocketsList );`
`4965`	`4965`	`pxIterator != pxEnd;`
`4966`	`4966`	`pxIterator = listGET_NEXT( pxIterator ) )`
`4967`	`4967`	`{`
`@@ -6085,13 +6085,15 @@ BaseType_t FreeRTOS_GetIPType( ConstSocket_t xSocket )`
`6085`	`6085`	`{`
`6086`	`6086`	`const ListItem_t * pxIterator;`
`6087`	`6087`	`const ListItem_t * pxEnd;`
	`6088`	`+ const List_t * pxList;`
`6088`	`6089`
`6089`	`6090`	`if( xRound == 0 )`
`6090`	`6091`	`{`
`6091`	`6092`	`/* MISRA Ref 11.3.1 [Misaligned access] */`
`6092`	`6093`	`/* More details at: https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/main/MISRA.md#rule-113 */`
`6093`	`6094`	`/* coverity[misra_c_2012_rule_11_3_violation] */`
`6094`	`6095`	`pxEnd = ( ( const ListItem_t * ) &( xBoundUDPSocketsList.xListEnd ) );`
	`6096`	`+ pxList = &xBoundUDPSocketsList;`
`6095`	`6097`	`}`
`6096`	`6098`
`6097`	`6099`	`#if ipconfigUSE_TCP == 1`
`@@ -6101,10 +6103,11 @@ BaseType_t FreeRTOS_GetIPType( ConstSocket_t xSocket )`
`6101`	`6103`	`/* More details at: https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/main/MISRA.md#rule-113 */`
`6102`	`6104`	`/* coverity[misra_c_2012_rule_11_3_violation] */`
`6103`	`6105`	`pxEnd = ( ( const ListItem_t * ) &( xBoundTCPSocketsList.xListEnd ) );`
	`6106`	`+ pxList = &xBoundTCPSocketsList;`
`6104`	`6107`	`}`
`6105`	`6108`	`#endif /* ipconfigUSE_TCP == 1 */`
`6106`	`6109`
`6107`		`- for( pxIterator = listGET_NEXT( pxEnd );`
	`6110`	`+ for( pxIterator = listGET_HEAD_ENTRY( pxList );`
`6108`	`6111`	`pxIterator != pxEnd;`
`6109`	`6112`	`pxIterator = listGET_NEXT( pxIterator ) )`
`6110`	`6113`	`{`