Fix nasa#711, Add msgid max val and update fcncode check

skliper · Aug 7, 2020 · 4e15ff2 · 4e15ff2
1 parent b5467c1
commit 4e15ff2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/modules/msg/src/cfe_msg_msgid_v1.c b/modules/msg/src/cfe_msg_msgid_v1.c
@@ -58,7 +58,7 @@ int32 CFE_MSG_SetMsgId(CFE_MSG_Message_t *MsgPtr, CFE_SB_MsgId_t MsgId)
 
     CFE_SB_MsgId_Atom_t msgidval = CFE_SB_MsgIdToValue(MsgId);
 
-    if (MsgPtr == NULL)
+    if (MsgPtr == NULL || msgidval > CFE_PLATFORM_SB_HIGHEST_VALID_MSGID)
     {
         return CFE_MSG_BAD_ARGUMENT;
     }

diff --git a/modules/msg/src/cfe_msg_msgid_v2.c b/modules/msg/src/cfe_msg_msgid_v2.c
@@ -40,6 +40,7 @@
 #include "cfe_msg_api.h"
 #include "cfe_msg_priv.h"
 #include "cfe_error.h"
+#include "cfe_platform_cfg.h"
 
 /* cFS MsgId definitions */
 #define CFE_MSG_MSGID_APID_MASK   0x007F /**< \brief CCSDS ApId mask for MsgId */
@@ -84,7 +85,7 @@ int32 CFE_MSG_SetMsgId(CFE_MSG_Message_t *MsgPtr, CFE_SB_MsgId_t MsgId)
 
     CFE_SB_MsgId_Atom_t msgidval = CFE_SB_MsgIdToValue(MsgId);
 
-    if (MsgPtr == NULL)
+    if (MsgPtr == NULL || msgidval > CFE_PLATFORM_SB_HIGHEST_VALID_MSGID) 
     {
         return CFE_MSG_BAD_ARGUMENT;
     }

diff --git a/modules/msg/src/cfe_msg_sechdr_fc.c b/modules/msg/src/cfe_msg_sechdr_fc.c
@@ -68,7 +68,7 @@ int32 CFE_MSG_SetFcnCode(CFE_MSG_Message_t *MsgPtr, CFE_MSG_FcnCode_t FcnCode)
     bool                     hassechdr = false;
     CFE_MSG_CommandHeader_t *cmd       = (CFE_MSG_CommandHeader_t *)MsgPtr;
 
-    if (MsgPtr == NULL || ((FcnCode & ~CFE_MSG_FC_MASK) != 0))
+    if (MsgPtr == NULL || (FcnCode > CFE_MSG_FC_MASK))
     {
         return CFE_MSG_BAD_ARGUMENT;
     }