Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #1204, Use mask instead of cast to alter value #1231

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions modules/msg/fsw/src/cfe_msg_msgid_v1.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}