Merge pull request #130 from chillfig/SA_jsc2_1

Fix #127, Adds static analysis comments and replace strncpy with snprintf
nasa · Jun 27, 2024 · c83933f · c83933f
2 parents ec96b02 + a5f1a8e
commit c83933f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/fsw/src/ds_app.c b/fsw/src/ds_app.c
@@ -358,8 +358,7 @@ void DS_AppSendHkCmd(void)
  Status = CFE_TBL_GetInfo(&FilterTblInfo, FilterTblName);
  if (Status == CFE_SUCCESS)
  {
- strncpy(PayloadPtr->FilterTblFilename, FilterTblInfo.LastFileLoaded, OS_MAX_PATH_LEN - 1);
- PayloadPtr->FilterTblFilename[OS_MAX_PATH_LEN - 1] = '\0';
+ snprintf(PayloadPtr->FilterTblFilename, OS_MAX_PATH_LEN, "%s", FilterTblInfo.LastFileLoaded);
  }
  else
  {

diff --git a/fsw/src/ds_appdefs.h b/fsw/src/ds_appdefs.h
@@ -43,7 +43,7 @@
 
 #define DS_PATH_SEPARATOR '/' /**< \brief File system path separator */
 
-#define DS_TABLE_VERIFY_ERR 0xFFFFFFFF /**< \brief Table verification error return value */
+#define DS_TABLE_VERIFY_ERR -1 /**< \brief Table verification error return value */
 
 #define DS_FILE_HEADER_NONE 0 /**< \brief File header type is NONE */
 #define DS_FILE_HEADER_CFE 1 /**< \brief File header type is CFE */

diff --git a/fsw/src/ds_cmds.c b/fsw/src/ds_cmds.c
@@ -1096,7 +1096,7 @@ void DS_GetFileInfoCmd(const CFE_SB_Buffer_t *BufPtr)
  /*
  ** Set current open filename...
  */
- strncpy(FileInfoPtr->FileName, DS_AppData.FileStatus[i].FileName, sizeof(FileInfoPtr->FileName));
+ snprintf(FileInfoPtr->FileName, sizeof(FileInfoPtr->FileName), "%s", DS_AppData.FileStatus[i].FileName);
  }
  }
 

diff --git a/fsw/src/ds_file.c b/fsw/src/ds_file.c
@@ -881,7 +881,7 @@ void DS_FileCloseDest(int32 FileIndex)
  }
 
  /* Update the path name for reporting */
- strncpy(FileStatus->FileName, PathName, sizeof(FileStatus->FileName));
+ snprintf(FileStatus->FileName, sizeof(FileStatus->FileName), "%s", PathName);
  }
  }
 
@@ -991,7 +991,7 @@ void DS_FileTransmit(DS_AppFileStatus_t *FileStatus)
  /*
  ** Set current open filename...
  */
- strncpy(FileInfo->FileName, FileStatus->FileName, sizeof(FileInfo->FileName));
+ snprintf(FileInfo->FileName, sizeof(FileInfo->FileName), "%s", FileStatus->FileName);
 
  /*
  ** Timestamp and send file info telemetry...