From 4e46fe011378f83a69a4cd31701bbed43a078323 Mon Sep 17 00:00:00 2001 From: Cody Martin Date: Fri, 8 Mar 2024 12:45:44 -0800 Subject: [PATCH 1/3] Send CMake message to stdout instead of stderr --- cmake/arch_build.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/arch_build.cmake b/cmake/arch_build.cmake index e152d7182..557d0e195 100644 --- a/cmake/arch_build.cmake +++ b/cmake/arch_build.cmake @@ -820,7 +820,7 @@ function(process_arch SYSVAR) if (FILESRC) # In case the file is a symlink, follow it to get to the actual file get_filename_component(FILESRC "${FILESRC}" REALPATH) - message("NOTE: Selected ${FILESRC} as source for ${INSTFILE} on ${TGTNAME}") + message(STATUS "NOTE: Selected ${FILESRC} as source for ${INSTFILE} on ${TGTNAME}") install(FILES ${FILESRC} DESTINATION ${TGTNAME}/${INSTALL_SUBDIR} RENAME ${INSTFILE}) else(FILESRC) message("WARNING: Install file ${INSTFILE} for ${TGTNAME} not found") From 4ea2b0c1309a95ebad504bca652596d6a59f440a Mon Sep 17 00:00:00 2001 From: Dylan Date: Tue, 21 May 2024 08:29:45 -0400 Subject: [PATCH 2/3] Updating documentation and version numbers for equuleus-rc1+dev137 --- CHANGELOG.md | 5 +++++ modules/core_api/fsw/inc/cfe_version.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fd62204e..0b3db8dc0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## Development Build: equuleus-rc1+dev137 +- msg api test buffer overrun +- send CMake message to stdout instead of stderr +- See and + ## Development Build: equuleus-rc1+dev131 - add handle list operation routines - See diff --git a/modules/core_api/fsw/inc/cfe_version.h b/modules/core_api/fsw/inc/cfe_version.h index 1ab37c239..6da2a45c2 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 131 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */ +#define CFE_BUILD_NUMBER 137 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */ #define CFE_BUILD_BASELINE "equuleus-rc1" /**< @brief Development: Reference git tag for build number */ #define CFE_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */ #define CFE_BUILD_CODENAME "Equuleus" /**< @brief: Development: Code name for the current build */ From 0dc799dd296011bd2cb6ff675812d77bbe94168c Mon Sep 17 00:00:00 2001 From: jdfiguer Date: Thu, 13 Jun 2024 13:24:50 -0400 Subject: [PATCH 3/3] Fix #2552, Adds JSC 2.1 Static Analysis comments --- modules/evs/fsw/src/cfe_evs_utils.c | 1 + modules/fs/fsw/src/cfe_fs_api.c | 1 + modules/tbl/fsw/src/cfe_tbl_internal.c | 1 + 3 files changed, 3 insertions(+) diff --git a/modules/evs/fsw/src/cfe_evs_utils.c b/modules/evs/fsw/src/cfe_evs_utils.c index 03a39a95a..db3afd915 100644 --- a/modules/evs/fsw/src/cfe_evs_utils.c +++ b/modules/evs/fsw/src/cfe_evs_utils.c @@ -545,6 +545,7 @@ void EVS_SendViaPorts(CFE_EVS_LongEventTlm_t *EVS_PktPtr) CFE_MSG_GetMsgTime(CFE_MSG_PTR(EVS_PktPtr->TelemetryHeader), &PktTime); CFE_TIME_Print(TimeBuffer, PktTime); + /* SAD: No need to check snprintf return; CFE_EVS_MAX_PORT_MSG_LENGTH is sized to accommodate buffer limits */ snprintf(PortMessage, sizeof(PortMessage), "%s %u/%u/%s %u: %s", TimeBuffer, (unsigned int)EVS_PktPtr->Payload.PacketID.SpacecraftID, (unsigned int)EVS_PktPtr->Payload.PacketID.ProcessorID, EVS_PktPtr->Payload.PacketID.AppName, diff --git a/modules/fs/fsw/src/cfe_fs_api.c b/modules/fs/fsw/src/cfe_fs_api.c index fbd0e54a0..40812f7b2 100644 --- a/modules/fs/fsw/src/cfe_fs_api.c +++ b/modules/fs/fsw/src/cfe_fs_api.c @@ -354,6 +354,7 @@ void CFE_FS_ByteSwapUint32(uint32 *Uint32ToSwapPtr) char *InPtr = (char *)&Temp; char *OutPtr = (char *)Uint32ToSwapPtr; + /* SAD: Safe access to InPtr[0-3] and OutPtr[0-3] as both manipulate bytes within 4-byte integers. */ OutPtr[0] = InPtr[3]; OutPtr[1] = InPtr[2]; OutPtr[2] = InPtr[1]; diff --git a/modules/tbl/fsw/src/cfe_tbl_internal.c b/modules/tbl/fsw/src/cfe_tbl_internal.c index 4ab8ef482..bf7949865 100644 --- a/modules/tbl/fsw/src/cfe_tbl_internal.c +++ b/modules/tbl/fsw/src/cfe_tbl_internal.c @@ -904,6 +904,7 @@ void CFE_TBL_ByteSwapUint32(uint32 *Uint32ToSwapPtr) char *InPtr = (char *)&Temp; char *OutPtr = (char *)Uint32ToSwapPtr; + /* SAD: Safe access to InPtr[0-3] and OutPtr[0-3] as both manipulate bytes within 4-byte integers. */ OutPtr[0] = InPtr[3]; OutPtr[1] = InPtr[2]; OutPtr[2] = InPtr[1];