Minor fix

Author: tony-josi-aws

source/FreeRTOS_ND.c

@@ -188,8 +188,8 @@
  * @return An enum which says whether the address was found: eARPCacheHit or eARPCacheMiss.
  */
     eARPLookupResult_t eNDGetCacheEntry( IPv6_Address_t * pxIPAddress,
-                                         MACAddress_t * const pxMACAddress,
-                                         struct xNetworkEndPoint ** ppxEndPoint )
+                                                MACAddress_t * const pxMACAddress,
+                                                struct xNetworkEndPoint ** ppxEndPoint )
     {
         eARPLookupResult_t eReturn;
         NetworkEndPoint_t * pxEndPoint;
@@ -258,12 +258,15 @@
                         /* See if the gateway has an entry in the cache. */
                         eReturn = prvNDCacheLookup( pxIPAddress, pxMACAddress, ppxEndPoint );
 
-                        if( *ppxEndPoint != NULL )
+                        if( ( ppxEndPoint != NULL ) && ( *ppxEndPoint != NULL ) )
                         {
                             FreeRTOS_printf( ( "eNDGetCacheEntry: found end-point %pip\n", ( void * ) ( *ppxEndPoint )->ipv6_settings.xIPAddress.ucBytes ) );
                         }
 
-                        *( ppxEndPoint ) = pxEndPoint;
+                        if( ppxEndPoint != NULL )
+                        {
+                            *( ppxEndPoint ) = pxEndPoint;
+                        }
                     }
                 }
             }

test/unit-test/FreeRTOS_ND/FreeRTOS_ND_utest.c

@@ -217,6 +217,32 @@ void test_eNDGetCacheEntry_Multicast_InvalidEndPoint( void )
     TEST_ASSERT_EQUAL( eARPCacheMiss, eResult );
 }
 
+/**
+ * @brief This function find the MAC-address of a multicast IPv6 address
+ *        with a NULL endpoint, but no active IPv6 endpoints.
+ */
+void test_eNDGetCacheEntry_Multicast_InvalidEndPoint_NoEP( void )
+{
+    NetworkEndPoint_t ** ppxEndPoint = NULL;
+    eARPLookupResult_t eResult;
+    MACAddress_t xMACAddress;
+    IPv6_Address_t xIPAddress;
+    NetworkEndPoint_t xEndPoint, * pxEndPoint = &xEndPoint, xEndPoint1;
+
+    ( void ) memcpy( xIPAddress.ucBytes, xMultiCastIPAddress.ucBytes, ipSIZE_OF_IPv6_ADDRESS );
+
+    xIsIPv6AllowedMulticast_ExpectAnyArgsAndReturn( pdTRUE );
+    vSetMultiCastIPv6MacAddress_ExpectAnyArgs();
+
+    xIPv6_GetIPType_ExpectAnyArgsAndReturn( eIPv6_Multicast );
+    FreeRTOS_FindEndPointOnIP_IPv6_ExpectAnyArgsAndReturn( NULL );
+    FreeRTOS_FindGateWay_ExpectAnyArgsAndReturn( &xEndPoint1 );
+
+    eResult = eNDGetCacheEntry( &xIPAddress, &xMACAddress, ppxEndPoint );
+
+    TEST_ASSERT_EQUAL( eARPCacheMiss, eResult );
+}
+
 /**
  * @brief This function find the MAC-address of an IPv6 address which is
  *        not multi cast address, but the entry is present on the ND Cache,