Fix #110, Adds JSC 2.1 Static Analysis comments

nasa · Jun 10, 2024 · 90ac3ed · 90ac3ed
1 parent b8769cd
commit 90ac3ed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/fsw/src/lc_cmds.c b/fsw/src/lc_cmds.c
@@ -176,6 +176,7 @@ CFE_Status_t LC_SendHkCmd(const CFE_MSG_CommandHeader_t *MsgPtr)
         }
 
         /* Update houskeeping watch results array */
+        /* SAD: HKIndex is derived from TableIndex, ensuring it stays within the bounds of the WPResults array */
         PayloadPtr->WPResults[HKIndex] = ByteData;
     }
 
@@ -248,6 +249,7 @@ CFE_Status_t LC_SendHkCmd(const CFE_MSG_CommandHeader_t *MsgPtr)
         }
 
         /* Update houskeeping action results array */
+        /* SAD: HKIndex is derived from TableIndex, ensuring it stays within the bounds of the APResults array */
         PayloadPtr->APResults[HKIndex] = ByteData;
     }
 

diff --git a/fsw/src/lc_watch.c b/fsw/src/lc_watch.c
@@ -493,6 +493,7 @@ uint8 LC_OperatorCompare(uint16 WatchIndex, uint32 ProcessedWPData)
             WatchpointValue.Unsigned32 = ProcessedWPData;
             break;
     }
+    /* SAD: Using memcpy to safely copy the float value from LC_MultiType_t to ComparisonValue, preserving bitwise representation */
     memcpy(&ComparisonValue, &LC_OperData.WDTPtr[WatchIndex].ComparisonValue, sizeof(LC_MultiType_t));
 
     /*
@@ -680,8 +681,9 @@ uint8 LC_FloatCompare(uint16 WatchIndex, LC_MultiType_t *WPMultiType, LC_MultiTy
     float Diff;
 
     OperatorID = LC_OperData.WDTPtr[WatchIndex].OperatorID;
-
+    /* SAD: Using memcpy to safely copy the float value from LC_MultiType_t to WPFloat, preserving bitwise representation */
     memcpy(&WPFloat, WPMultiType, sizeof(float));
+    /* SAD: Using memcpy to safely copy the float value from LC_MultiType_t to CompareFloat, preserving bitwise representation */
     memcpy(&CompareFloat, CompareMultiType, sizeof(float));
 
     /*
@@ -1021,6 +1023,7 @@ int32 LC_ValidateWDT(void *TableData)
         }
         else if ((DataType == LC_DATA_WATCH_FLOAT_BE) || (DataType == LC_DATA_WATCH_FLOAT_LE))
         {
+            /* SAD: Using memcpy to safely copy the float value from LC_MultiType_t to FloatValue, preserving bitwise representation */
             memcpy(&FloatValue, &TableArray[TableIndex].ComparisonValue, sizeof(FloatValue));
 
             /*
@@ -1060,6 +1063,7 @@ int32 LC_ValidateWDT(void *TableData)
         {
             if ((EntryResult == LC_WDTVAL_ERR_FPNAN) || (EntryResult == LC_WDTVAL_ERR_FPINF))
             {
+                /* SAD: Using memcpy to safely copy the uint32 value from LC_MultiType_t to PrintableBits, preserving bitwise representation */
                 memcpy(&PrintableBits, &TableArray[TableIndex].ComparisonValue, sizeof(PrintableBits));
                 CFE_EVS_SendEvent(LC_WDTVAL_FPERR_EID, CFE_EVS_EventType_ERROR,
                                   "WDT verify float err: WP = %d, Err = %d, ComparisonValue = 0x%08X", (int)TableIndex,