Skip to content

Fix #2040, Improve CFE_SB_IsValidMsgId handler #2041

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 3, 2022
Merged

Fix #2040, Improve CFE_SB_IsValidMsgId handler #2041

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 12 additions & 5 deletions modules/core_api/ut-stubs/src/cfe_sb_handlers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,12 +398,19 @@ void UT_DefaultHandler_CFE_SB_GetUserDataLength(void *UserObj, UT_EntryKey_t Fun
*------------------------------------------------------------*/
void UT_DefaultHandler_CFE_SB_IsValidMsgId(void *UserObj, UT_EntryKey_t FuncKey, const UT_StubContext_t *Context)
{
int32 status;
bool return_value;

UT_Stub_GetInt32StatusCode(Context, &status);
int32 status;
bool return_value;
CFE_SB_MsgId_t MsgId = UT_Hook_GetArgValueByName(Context, "MsgId", CFE_SB_MsgId_t);

return_value = status;
if (UT_Stub_GetInt32StatusCode(Context, &status))
{
return_value = status;
}
else
{
/* The only invalid value UT's should be using is CFE_SB_INVALID_MSG_ID */
return_value = !CFE_SB_MsgId_Equal(MsgId, CFE_SB_INVALID_MSG_ID);
}

UT_Stub_SetReturnValue(FuncKey, return_value);
}
Expand Down