Skip to content
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

Jump to bottom

Fix #127, Adds static analysis comments and replace strncpy with snprintf #130

Merged
merged 1 commit into from
Jun 27, 2024
Merged

Fix #127, Adds static analysis comments and replace strncpy with snprintf #130

Show file tree
Hide file tree
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
3 changes: 1 addition & 2 deletions fsw/src/ds_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion fsw/src/ds_appdefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion fsw/src/ds_cmds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
4 changes: 2 additions & 2 deletions fsw/src/ds_file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down Expand Up @@ -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...
Expand Down
Loading