From e045dbbeac7266b4aa39c958a4c873baee97170d Mon Sep 17 00:00:00 2001 From: Michael Yang Date: Wed, 7 May 2025 12:02:20 -0400 Subject: [PATCH 1/2] Fix #71, Updated unit-test/hk_utils_tests.c for the address-sanitizer --- unit-test/hk_utils_tests.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/unit-test/hk_utils_tests.c b/unit-test/hk_utils_tests.c index b2a982b..bed934e 100644 --- a/unit-test/hk_utils_tests.c +++ b/unit-test/hk_utils_tests.c @@ -123,7 +123,7 @@ void Test_HK_ProcessIncomingHkData_LengthOkEqual(void) size_t forced_Size; CFE_SB_Buffer_t Buf; int i; - CFE_SB_Buffer_t OutputPkt; + uint8 OutputPkt[100]; hk_runtime_tbl_entry_t RtTblPtr[HK_COPY_TABLE_ENTRIES]; hk_copy_table_entry_t CopyTblPtr[HK_COPY_TABLE_ENTRIES]; @@ -131,7 +131,7 @@ void Test_HK_ProcessIncomingHkData_LengthOkEqual(void) HK_Test_InitGoodCopyTable(CopyTblPtr); HK_Test_InitGoodRuntimeTable(RtTblPtr); - RtTblPtr[2].OutputPktAddr = &OutputPkt; + RtTblPtr[2].OutputPktAddr = OutputPkt; HK_AppData.CopyTablePtr = CopyTblPtr; HK_AppData.RuntimeTablePtr = RtTblPtr; @@ -181,7 +181,7 @@ void Test_HK_ProcessIncomingHkData_LengthOkGreater(void) CFE_SB_MsgId_t forced_MsgID; size_t forced_Size; CFE_SB_Buffer_t Buf; - CFE_SB_Buffer_t OutputPkt; + uint8 OutputPkt[100]; hk_runtime_tbl_entry_t RtTblPtr[HK_COPY_TABLE_ENTRIES]; hk_copy_table_entry_t CopyTblPtr[HK_COPY_TABLE_ENTRIES]; @@ -189,7 +189,7 @@ void Test_HK_ProcessIncomingHkData_LengthOkGreater(void) HK_Test_InitGoodCopyTable(CopyTblPtr); HK_Test_InitGoodRuntimeTable(RtTblPtr); - RtTblPtr[2].OutputPktAddr = &OutputPkt; + RtTblPtr[2].OutputPktAddr = OutputPkt; HK_AppData.CopyTablePtr = CopyTblPtr; HK_AppData.RuntimeTablePtr = RtTblPtr; From 3b0c8aea32e0e0b1372618314f093d704fb6c31a Mon Sep 17 00:00:00 2001 From: Michael Yang Date: Mon, 2 Jun 2025 11:50:33 -0400 Subject: [PATCH 2/2] Fix #71, Cast OutputPkt to (CFE_SB_Buffer_t*) for Test_HK_ProcessIncomingHkData_LengthOkEqual(void) and Test_HK_ProcessIncomingHkData_LengthOkGreater(void) --- unit-test/hk_utils_tests.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/unit-test/hk_utils_tests.c b/unit-test/hk_utils_tests.c index bed934e..775cd46 100644 --- a/unit-test/hk_utils_tests.c +++ b/unit-test/hk_utils_tests.c @@ -131,7 +131,7 @@ void Test_HK_ProcessIncomingHkData_LengthOkEqual(void) HK_Test_InitGoodCopyTable(CopyTblPtr); HK_Test_InitGoodRuntimeTable(RtTblPtr); - RtTblPtr[2].OutputPktAddr = OutputPkt; + RtTblPtr[2].OutputPktAddr = (CFE_SB_Buffer_t*)OutputPkt; HK_AppData.CopyTablePtr = CopyTblPtr; HK_AppData.RuntimeTablePtr = RtTblPtr; @@ -189,7 +189,7 @@ void Test_HK_ProcessIncomingHkData_LengthOkGreater(void) HK_Test_InitGoodCopyTable(CopyTblPtr); HK_Test_InitGoodRuntimeTable(RtTblPtr); - RtTblPtr[2].OutputPktAddr = OutputPkt; + RtTblPtr[2].OutputPktAddr = (CFE_SB_Buffer_t*)OutputPkt; HK_AppData.CopyTablePtr = CopyTblPtr; HK_AppData.RuntimeTablePtr = RtTblPtr;