Merge pull request #28 from skliper/fix9-ut_static_analysis

Fix #8 #9, Resolve static analysis warnings
nasa · May 31, 2022 · 646332b · 646332b
2 parents d076920 + 3c75063
commit 646332b
Show file tree

Hide file tree

Showing 8 changed files with 222 additions and 87 deletions.
diff --git a/fsw/src/cs_app.c b/fsw/src/cs_app.c
@@ -592,6 +592,8 @@ int32 CS_CreateRestoreStatesFromCDS(void)
     int32 Result;
     int32 EventId = 0;
 
+    memset(DataStoreBuffer, 0, sizeof(DataStoreBuffer));
+
     /*
     ** Request for CDS area from cFE Executive Services...
     */

diff --git a/fsw/src/cs_app_cmds.c b/fsw/src/cs_app_cmds.c
@@ -117,7 +117,7 @@ void CS_ReportBaselineAppCmd(const CS_AppNameCmd_t *CmdPtr)
     /* Verify command packet length */
     if (CS_VerifyCmdLength(&CmdPtr->CmdHeader.Msg, ExpectedLength))
     {
-        strncpy(Name, CmdPtr->Name, sizeof(Name));
+        strncpy(Name, CmdPtr->Name, sizeof(Name) - 1);
         Name[sizeof(Name) - 1] = '\0';
 
         if (CS_GetAppResTblEntryByName(&ResultsEntry, Name))
@@ -166,7 +166,7 @@ void CS_RecomputeBaselineAppCmd(const CS_AppNameCmd_t *CmdPtr)
     {
         if (CS_AppData.HkPacket.RecomputeInProgress == false && CS_AppData.HkPacket.OneShotInProgress == false)
         {
-            strncpy(Name, CmdPtr->Name, sizeof(Name));
+            strncpy(Name, CmdPtr->Name, sizeof(Name) - 1);
             Name[sizeof(Name) - 1] = '\0';
 
             /* make sure the entry is a valid number and is defined in the table */
@@ -234,7 +234,7 @@ void CS_DisableNameAppCmd(const CS_AppNameCmd_t *CmdPtr)
     {
         if (CS_CheckRecomputeOneshot() == false)
         {
-            strncpy(Name, CmdPtr->Name, sizeof(Name));
+            strncpy(Name, CmdPtr->Name, sizeof(Name) - 1);
             Name[sizeof(Name) - 1] = '\0';
 
             if (CS_GetAppResTblEntryByName(&ResultsEntry, Name))
@@ -292,7 +292,7 @@ void CS_EnableNameAppCmd(const CS_AppNameCmd_t *CmdPtr)
     {
         if (CS_CheckRecomputeOneshot() == false)
         {
-            strncpy(Name, CmdPtr->Name, sizeof(Name));
+            strncpy(Name, CmdPtr->Name, sizeof(Name) - 1);
             Name[sizeof(Name) - 1] = '\0';
 
             if (CS_GetAppResTblEntryByName(&ResultsEntry, Name))

diff --git a/fsw/src/cs_table_cmds.c b/fsw/src/cs_table_cmds.c
@@ -118,7 +118,7 @@ void CS_ReportBaselineTablesCmd(const CS_TableNameCmd_t *CmdPtr)
     /* Verify command packet length */
     if (CS_VerifyCmdLength(&CmdPtr->CmdHeader.Msg, ExpectedLength))
     {
-        strncpy(Name, CmdPtr->Name, sizeof(Name));
+        strncpy(Name, CmdPtr->Name, sizeof(Name) - 1);
         Name[sizeof(Name) - 1] = '\0';
 
         if (CS_GetTableResTblEntryByName(&ResultsEntry, Name))
@@ -168,7 +168,7 @@ void CS_RecomputeBaselineTablesCmd(const CS_TableNameCmd_t *CmdPtr)
 
         if (CS_AppData.HkPacket.RecomputeInProgress == false && CS_AppData.HkPacket.OneShotInProgress == false)
         {
-            strncpy(Name, CmdPtr->Name, sizeof(Name));
+            strncpy(Name, CmdPtr->Name, sizeof(Name) - 1);
             Name[sizeof(Name) - 1] = '\0';
 
             /* make sure the entry is a valid number and is defined in the table */
@@ -236,7 +236,7 @@ void CS_DisableNameTablesCmd(const CS_TableNameCmd_t *CmdPtr)
     {
         if (CS_CheckRecomputeOneshot() == false)
         {
-            strncpy(Name, CmdPtr->Name, sizeof(Name));
+            strncpy(Name, CmdPtr->Name, sizeof(Name) - 1);
             Name[sizeof(Name) - 1] = '\0';
 
             if (CS_GetTableResTblEntryByName(&ResultsEntry, Name))
@@ -293,7 +293,7 @@ void CS_EnableNameTablesCmd(const CS_TableNameCmd_t *CmdPtr)
     {
         if (CS_CheckRecomputeOneshot() == false)
         {
-            strncpy(Name, CmdPtr->Name, sizeof(Name));
+            strncpy(Name, CmdPtr->Name, sizeof(Name) - 1);
             Name[sizeof(Name) - 1] = '\0';
 
             if (CS_GetTableResTblEntryByName(&ResultsEntry, Name))