Merge pull request #236 from nasa/integration-candidate

sample_app Integration candidate: Equuleus-rc1+dev26
nasa · Feb 25, 2025 · 97ef16c · 97ef16c
2 parents ceaf7ab + a48745f
commit 97ef16c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: equuleus-rc1+dev50
+- Address sanitizer issue
+- See <https://github.com/nasa/sample_app/pull/235>
+
 ## 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
@@ -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 */

diff --git 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);