FreeRTOS_{DHCPv6,DNS}_utest: Fix memory leaks

Consider undoing this and see if the code under test needs fixing. LeakSanitizer finds these.
anordal · May 26, 2024 · e285bff · e285bff
1 parent df5aa88
commit e285bff
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/test/unit-test/FreeRTOS_DHCPv6/FreeRTOS_DHCPv6_utest.c b/test/unit-test/FreeRTOS_DHCPv6/FreeRTOS_DHCPv6_utest.c
@@ -1388,6 +1388,7 @@ void test_vDHCPv6Process_ResetFromInit()
     vDHCP_RATimerReload_Expect( &xEndPoint, dhcpINITIAL_TIMER_PERIOD );
 
     vDHCPv6Process( pdTRUE, &xEndPoint );
+    vPortFree( xEndPoint.pxDHCPMessage ); /* Make LeakSanitizer happy. */
 
     /* The endpoint sends the DHCPv6 Solicitation message to find the DHCPv6 server.
      * Then change the state to eWaitingSendFirstDiscover. */

diff --git a/test/unit-test/FreeRTOS_DNS/FreeRTOS_DNS_utest.c b/test/unit-test/FreeRTOS_DNS/FreeRTOS_DNS_utest.c
@@ -776,10 +776,9 @@ void test_FreeRTOS_getaddrinfo_a_UnknownHintFamily( void )
 void test_FreeRTOS_getaddrinfo_a_IPv4AddressFound( void )
 {
     BaseType_t xReturn;
-    struct freertos_addrinfo xAddress, * pxAddress = &xAddress;
+    struct freertos_addrinfo * pxAddress;
     struct freertos_addrinfo xHint, * pxHint = &xHint;
 
-    memset( &xAddress, 0, sizeof( struct freertos_addrinfo ) );
     memset( &xHint, 0, sizeof( struct freertos_addrinfo ) );
 
     xHint.ai_family = FREERTOS_AF_INET4;
@@ -794,6 +793,8 @@ void test_FreeRTOS_getaddrinfo_a_IPv4AddressFound( void )
     TEST_ASSERT_EQUAL( FREERTOS_AF_INET4, pxAddress->ai_family );
     TEST_ASSERT_EQUAL( DOTTED_IPV4_ADDRESS_UINT32, FreeRTOS_htonl( pxAddress->ai_addr->sin_address.ulIP_IPv4 ) );
     TEST_ASSERT_EQUAL( ipSIZE_OF_IPv4_ADDRESS, pxAddress->ai_addrlen );
+
+    vPortFree( pxAddress ); /* Make LeakSanitizer happy. */
 }
 
 /**
@@ -802,10 +803,9 @@ void test_FreeRTOS_getaddrinfo_a_IPv4AddressFound( void )
 void test_FreeRTOS_getaddrinfo_a_IPv6AddressFound( void )
 {
     BaseType_t xReturn;
-    struct freertos_addrinfo xAddress, * pxAddress = &xAddress;
+    struct freertos_addrinfo * pxAddress;
     struct freertos_addrinfo xHint, * pxHint = &xHint;
 
-    memset( &xAddress, 0, sizeof( struct freertos_addrinfo ) );
     memset( &xHint, 0, sizeof( struct freertos_addrinfo ) );
 
     xHint.ai_family = FREERTOS_AF_INET6;
@@ -821,6 +821,8 @@ void test_FreeRTOS_getaddrinfo_a_IPv6AddressFound( void )
     TEST_ASSERT_EQUAL( FREERTOS_AF_INET6, pxAddress->ai_family );
     TEST_ASSERT_EQUAL_MEMORY( xIPv6Address.ucBytes, pxAddress->ai_addr->sin_address.xIP_IPv6.ucBytes, ipSIZE_OF_IPv6_ADDRESS );
     TEST_ASSERT_EQUAL( ipSIZE_OF_IPv6_ADDRESS, pxAddress->ai_addrlen );
+
+    vPortFree( pxAddress ); /* Make LeakSanitizer happy. */
 }
 
 /**

diff --git a/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/FreeRTOS_DNS_ConfigNoCallback_utest.c b/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/FreeRTOS_DNS_ConfigNoCallback_utest.c
@@ -90,10 +90,9 @@ void setUp( void )
 void test_FreeRTOS_getaddrinfo_IPv4AddressFound( void )
 {
     BaseType_t xReturn;
-    struct freertos_addrinfo xAddress, * pxAddress = &xAddress;
+    struct freertos_addrinfo * pxAddress;
     struct freertos_addrinfo xHint, * pxHint = &xHint;
 
-    memset( &xAddress, 0, sizeof( struct freertos_addrinfo ) );
     memset( &xHint, 0, sizeof( struct freertos_addrinfo ) );
 
     xHint.ai_family = FREERTOS_AF_INET4;
@@ -107,6 +106,8 @@ void test_FreeRTOS_getaddrinfo_IPv4AddressFound( void )
     TEST_ASSERT_EQUAL( FREERTOS_AF_INET4, pxAddress->ai_family );
     TEST_ASSERT_EQUAL( DOTTED_IPV4_ADDRESS_UINT32, FreeRTOS_htonl( pxAddress->ai_addr->sin_address.ulIP_IPv4 ) );
     TEST_ASSERT_EQUAL( ipSIZE_OF_IPv4_ADDRESS, pxAddress->ai_addrlen );
+
+    vPortFree( pxAddress ); /* Make LeakSanitizer happy. */
 }
 
 /**