From 7532a88f9f7048409b3d1cc4bc429ff553090463 Mon Sep 17 00:00:00 2001 From: Anh D Van Date: Wed, 19 Feb 2025 20:40:39 +0000 Subject: [PATCH 1/2] Fix #232, Address sanitizer issue Fix #232, set data buffer for CFE_TBL_GetAddress --- unit-test/coveragetest/coveragetest_sample_app_cmds.c | 1 + 1 file changed, 1 insertion(+) diff --git a/unit-test/coveragetest/coveragetest_sample_app_cmds.c b/unit-test/coveragetest/coveragetest_sample_app_cmds.c index 036dbc0..9bee959 100644 --- a/unit-test/coveragetest/coveragetest_sample_app_cmds.c +++ b/unit-test/coveragetest/coveragetest_sample_app_cmds.c @@ -177,6 +177,7 @@ void Test_SAMPLE_APP_ProcessCmd(void) * reporting the table values, and one through the CFE_TBL_ReleaseAddress() * error path. */ + UT_SetDataBuffer(UT_KEY(CFE_TBL_GetAddress), &TblPtr, sizeof(TblPtr), false); UT_SetDefaultReturnValue(UT_KEY(CFE_TBL_GetAddress), CFE_SUCCESS); UT_SetDefaultReturnValue(UT_KEY(CFE_TBL_ReleaseAddress), CFE_TBL_ERR_NO_ACCESS); UtAssert_INT32_EQ(SAMPLE_APP_ProcessCmd(&TestMsg), CFE_TBL_ERR_NO_ACCESS); From a48745f011d3dbf1ac317f79c664098294433cbf Mon Sep 17 00:00:00 2001 From: Dylan Date: Tue, 25 Feb 2025 09:44:47 -0500 Subject: [PATCH 2/2] Updating documentation and version numbers for equuleus-rc1+dev50 --- CHANGELOG.md | 4 ++++ fsw/src/sample_app_version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a444f6c..a6ed693 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Development Build: equuleus-rc1+dev50 +- Address sanitizer issue +- See + ## Development Build: equuleus-rc1+dev46 - Convert remaining int32 CFE status variables to CFE_Status_t - Convert syslog writes during initialization to events diff --git a/fsw/src/sample_app_version.h b/fsw/src/sample_app_version.h index ea29947..a336924 100644 --- a/fsw/src/sample_app_version.h +++ b/fsw/src/sample_app_version.h @@ -27,7 +27,7 @@ /* Development Build Macro Definitions */ -#define SAMPLE_APP_BUILD_NUMBER 46 /*!< Development Build: Number of commits since baseline */ +#define SAMPLE_APP_BUILD_NUMBER 50 /*!< Development Build: Number of commits since baseline */ #define SAMPLE_APP_BUILD_BASELINE "equuleus-rc1" /*!< Development Build: git tag that is the base for the current development */ #define SAMPLE_APP_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */ #define SAMPLE_APP_BUILD_CODENAME "Equuleus" /**< @brief: Development: Code name for the current build */