From ba29f16e21137cead0135ed628b8ed74f16c09b4 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Tue, 16 Mar 2021 16:54:35 -0400 Subject: [PATCH] Fix #1204, Use mask instead of cast to alter value --- modules/msg/fsw/src/cfe_msg_msgid_v1.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/msg/fsw/src/cfe_msg_msgid_v1.c b/modules/msg/fsw/src/cfe_msg_msgid_v1.c index 47c002a0c..fe8ef8156 100644 --- a/modules/msg/fsw/src/cfe_msg_msgid_v1.c +++ b/modules/msg/fsw/src/cfe_msg_msgid_v1.c @@ -65,8 +65,9 @@ int32 CFE_MSG_SetMsgId(CFE_MSG_Message_t *MsgPtr, CFE_SB_MsgId_t MsgId) return CFE_MSG_BAD_ARGUMENT; } - MsgPtr->CCSDS.Pri.StreamId[0] = (uint8)(msgidval >> 8); - MsgPtr->CCSDS.Pri.StreamId[1] = (uint8)(msgidval); + /* Shift and mask bytes to be endian agnostic */ + MsgPtr->CCSDS.Pri.StreamId[0] = (msgidval >> 8) & 0xFF; + MsgPtr->CCSDS.Pri.StreamId[1] = msgidval & 0xFF; return CFE_SUCCESS; }