From 84b42867275d9ce89a9a5b0b1609e662e669d52b Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Thu, 18 Aug 2022 11:20:28 -0500 Subject: [PATCH 1/2] Fix #2137, Squash uninit var static analysis warnings --- modules/cfe_testcase/src/sb_sendrecv_test.c | 2 +- modules/evs/fsw/src/cfe_evs_utils.c | 2 +- modules/evs/ut-coverage/evs_UT.c | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/cfe_testcase/src/sb_sendrecv_test.c b/modules/cfe_testcase/src/sb_sendrecv_test.c index f89db7a2c..79abe472e 100644 --- a/modules/cfe_testcase/src/sb_sendrecv_test.c +++ b/modules/cfe_testcase/src/sb_sendrecv_test.c @@ -226,7 +226,7 @@ void TestMsgBroadcast(void) CFE_SB_PipeId_t PipeId3 = CFE_SB_INVALID_PIPE; CFE_SB_PipeId_t PipeId4 = CFE_SB_INVALID_PIPE; CFE_FT_TestCmdMessage_t CmdMsg; - CFE_SB_MsgId_t MsgId; + CFE_SB_MsgId_t MsgId = CFE_SB_INVALID_MSG_ID; CFE_SB_Buffer_t * MsgBuf1; CFE_SB_Buffer_t * MsgBuf2; CFE_SB_Buffer_t * MsgBuf3; diff --git a/modules/evs/fsw/src/cfe_evs_utils.c b/modules/evs/fsw/src/cfe_evs_utils.c index 669aefda8..3eb2af47a 100644 --- a/modules/evs/fsw/src/cfe_evs_utils.c +++ b/modules/evs/fsw/src/cfe_evs_utils.c @@ -301,7 +301,7 @@ bool EVS_CheckAndIncrementSquelchTokens(EVS_AppData_t *AppDataPtr) { bool NotSquelched = true; bool SendSquelchEvent = false; - OS_time_t CurrentTime; + OS_time_t CurrentTime = {0}; int64 DeltaTimeMs; int64 CreditCount; char AppName[OS_MAX_API_NAME]; diff --git a/modules/evs/ut-coverage/evs_UT.c b/modules/evs/ut-coverage/evs_UT.c index 0e6499449..5ead8f850 100644 --- a/modules/evs/ut-coverage/evs_UT.c +++ b/modules/evs/ut-coverage/evs_UT.c @@ -267,6 +267,9 @@ void Test_Init(void) UtPrintf("Begin Test Init"); + memset(&bitmaskcmd, 0, sizeof(bitmaskcmd)); + memset(&appbitcmd, 0, sizeof(appbitcmd)); + strncpy(appbitcmd.Payload.AppName, "ut_cfe_evs", sizeof(appbitcmd.Payload.AppName) - 1); appbitcmd.Payload.AppName[sizeof(appbitcmd.Payload.AppName) - 1] = '\0'; From 0186dcf11f5a47753ee5d0c80fa3fa7a771694ba Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 25 Aug 2022 16:31:52 -0400 Subject: [PATCH 2/2] Bump to v7.0.0-rc4+dev167 --- README.md | 4 ++++ modules/core_api/fsw/inc/cfe_version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e59077e7c..31e32cc0f 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,10 @@ The detailed cFE user's guide can be viewed at + ### Development Build: v7.0.0-rc4+dev163 - Increase event burst credit to not squelch at startup in CI - Grammatical/format updates to EVS flooding requirements diff --git a/modules/core_api/fsw/inc/cfe_version.h b/modules/core_api/fsw/inc/cfe_version.h index db5566d02..6256515d4 100644 --- a/modules/core_api/fsw/inc/cfe_version.h +++ b/modules/core_api/fsw/inc/cfe_version.h @@ -26,7 +26,7 @@ #define CFE_VERSION_H /* Development Build Macro Definitions */ -#define CFE_BUILD_NUMBER 163 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */ +#define CFE_BUILD_NUMBER 167 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */ #define CFE_BUILD_BASELINE "v7.0.0-rc4" /**< @brief Development: Reference git tag for build number */ /* See \ref cfsversions for definitions */