Fix #99, Fill in `Name` variable to avoid being used uninitialized #100

thnkslprpt · 2024-11-30T10:07:17Z

Checklist

I reviewed the Contributing Guide.
I signed and emailed the appropriate Contributor License Agreement to [email protected] and copied [email protected].

Describe the contribution

Fixes Name variable used in events before being filled in #99
- Moved up the strncpy to fill in the Name variable before the if block, in order to ensure it is filled in for the final error event as well.

Minor changes:

Formatting applied to remove incorrect indentation in the files being edited
Baseline variable in CS_ReportBaselineAppCmd, CS_ReportBaselineEntryIDEepromCmd, CS_ReportBaselineEntryIDMemoryCmd and CS_ReportBaselineTablesCmd only used once in these functions - simplifies to use the value directly and avoid the extra variable (happy to separate out these changes into a separate PR if more suitable).
- In CS_ReportBaselineEntryIDEepromCmd & CS_ReportBaselineEntryIDEepromCmd two additional simplifications look reasonable:
  - ResultsEntry can be removed
  - the assignment of CS_STATE_UNDEFINED to State can be done at initialization, simplifying the if/else in the error condition

Testing performed
GitHub CI actions all passing successfully (incl. Build + Run, Unit/Functional Tests etc.).

Expected behavior changes
Name variable will be filled in in all use-cases.
Unnecessary variables are removed, which simplifies the code and eases maintenance/testing.

System(s) tested on
Debian 12 using the current main branch of cFS bundle.

Contributor Info
Avi Weiss @thnkslprpt

fsw/src/cs_app_cmds.c


-        if (CS_GetAppResTblEntryByName(&ResultsEntry, Name))
+    if (CS_GetAppResTblEntryByName(&ResultsEntry, Name))


fsw/src/cs_app_cmds.c

+        CS_AppData.HkPacket.Payload.OneShotInProgress == false)
+    {
+        /* make sure the entry is a valid number and is defined in the table */
+        if (CS_GetAppResTblEntryByName(&ResultsEntry, Name))


fsw/src/cs_app_cmds.c


-                CFE_EVS_SendEvent(CS_DISABLE_APP_NAME_INF_EID, CFE_EVS_EventType_INFORMATION,
-                                  "Checksumming of app %s is Disabled", Name);
+        if (CS_GetAppResTblEntryByName(&ResultsEntry, Name))


fsw/src/cs_app_cmds.c


-                CS_AppData.HkPacket.Payload.CmdCounter++;
+            if (CS_GetAppDefTblEntryByName(&DefinitionEntry, Name))


fsw/src/cs_app_cmds.c


-                CFE_EVS_SendEvent(CS_ENABLE_APP_NAME_INF_EID, CFE_EVS_EventType_INFORMATION,
-                                  "Checksumming of app %s is Enabled", Name);
+        if (CS_GetAppResTblEntryByName(&ResultsEntry, Name))


fsw/src/cs_table_cmds.c

+        CS_AppData.HkPacket.Payload.OneShotInProgress == false)
+    {
+        /* make sure the entry is a valid number and is defined in the table */
+        if (CS_GetTableResTblEntryByName(&ResultsEntry, Name))


fsw/src/cs_table_cmds.c


-                CFE_EVS_SendEvent(CS_DISABLE_TABLES_NAME_INF_EID, CFE_EVS_EventType_INFORMATION,
-                                  "Checksumming of table %s is Disabled", Name);
+        if (CS_GetTableResTblEntryByName(&ResultsEntry, Name))


fsw/src/cs_table_cmds.c


-                CS_AppData.HkPacket.Payload.CmdCounter++;
+            if (CS_GetTableDefTblEntryByName(&DefinitionEntry, Name))


fsw/src/cs_table_cmds.c


-                CFE_EVS_SendEvent(CS_ENABLE_TABLES_NAME_INF_EID, CFE_EVS_EventType_INFORMATION,
-                                  "Checksumming of table %s is Enabled", Name);
+        if (CS_GetTableResTblEntryByName(&ResultsEntry, Name))


fsw/src/cs_table_cmds.c


-                CS_AppData.HkPacket.Payload.CmdCounter++;
+            if (CS_GetTableDefTblEntryByName(&DefinitionEntry, Name))


thnkslprpt force-pushed the fix-99-fill-in-name-variable-at-top-of-function branch from c4e87dc to 4b79eaf Compare November 30, 2024 10:23

github-advanced-security bot found potential problems Nov 30, 2024

View reviewed changes

thnkslprpt force-pushed the fix-99-fill-in-name-variable-at-top-of-function branch from 4b79eaf to 6f88718 Compare November 30, 2024 13:16

Fix nasa#99, Fill in Name variable to avoid being used uninitialized

951d776

thnkslprpt force-pushed the fix-99-fill-in-name-variable-at-top-of-function branch from 6f88718 to 951d776 Compare November 30, 2024 15:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix #99, Fill in `Name` variable to avoid being used uninitialized #100

Fix #99, Fill in `Name` variable to avoid being used uninitialized #100

thnkslprpt commented Nov 30, 2024 •

edited

Loading


		if (CS_GetAppResTblEntryByName(&ResultsEntry, Name))
		if (CS_GetAppResTblEntryByName(&ResultsEntry, Name))


		CS_AppData.HkPacket.Payload.CmdCounter++;
		if (CS_GetAppDefTblEntryByName(&DefinitionEntry, Name))


		CS_AppData.HkPacket.Payload.CmdCounter++;
		if (CS_GetTableDefTblEntryByName(&DefinitionEntry, Name))

Fix #99, Fill in Name variable to avoid being used uninitialized #100

Are you sure you want to change the base?

Fix #99, Fill in Name variable to avoid being used uninitialized #100

Conversation

thnkslprpt commented Nov 30, 2024 • edited Loading

Fix #99, Fill in `Name` variable to avoid being used uninitialized #100

Fix #99, Fill in `Name` variable to avoid being used uninitialized #100

thnkslprpt commented Nov 30, 2024 •

edited

Loading