Skip to content

Fix #484, reject invalid move-target buffers #519

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

Open
sylvesterkaczmarek wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix #484, reject invalid move-target buffers #519

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
6 changes: 6 additions & 0 deletions fsw/src/cf_cfdp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2459,6 +2459,12 @@ const char *CF_CFDP_GetMoveTarget(const char *dest_dir, const char *subject_file
const char *filename;
int dest_path_len;

/* A returned destination must have space for its string terminator. */
if (dest_buf == NULL || dest_size == 0)
{
return NULL;
}

result = NULL;
if (dest_dir != NULL && dest_dir[0] != 0)
{
Expand Down
4 changes: 2 additions & 2 deletions fsw/src/cf_cfdp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -840,8 +840,8 @@ CF_CListTraverse_Status_t CF_CFDP_DoTick(CF_CListNode_t *node, void *context);
* @param dest_buf Buffer to store result
* @param dest_size Size of result buffer
*
* @retval NULL if the result is not valid (i.e. dest_dir not set)
* @retval dest_buf if result is valid
* @retval NULL if dest_dir is not set, dest_buf is NULL, or dest_size is zero
* @retval dest_buf if result is a valid NUL-terminated string
*/
const char *CF_CFDP_GetMoveTarget(const char *dest_dir, const char *subject_file, char *dest_buf, size_t dest_size);

Expand Down
24 changes: 24 additions & 0 deletions unit-test/cf_cfdp_tests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1920,10 +1920,34 @@ void Test_CF_CFDP_GetMoveTarget(void)
*/
char FileNameBuf[6];

/* No destination capacity must not return an uninitialized string. */
memset(FileNameBuf, 'X', sizeof(FileNameBuf));
UtAssert_NULL(CF_CFDP_GetMoveTarget("d", "ut", FileNameBuf, 0));
UtAssert_True(memcmp(FileNameBuf, "XXXXXX", sizeof(FileNameBuf)) == 0, "Zero-capacity output remains untouched");

/* nominal, no dest dir */
UtAssert_NULL(CF_CFDP_GetMoveTarget(NULL, "ut", FileNameBuf, sizeof(FileNameBuf)));
UtAssert_NULL(CF_CFDP_GetMoveTarget("", "ut", FileNameBuf, sizeof(FileNameBuf)));

/* Missing storage is invalid regardless of its reported capacity. */
UtAssert_NULL(CF_CFDP_GetMoveTarget("d", "ut", NULL, 0));
UtAssert_NULL(CF_CFDP_GetMoveTarget("d", "ut", NULL, sizeof(FileNameBuf)));
UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0);

/* One byte holds the terminator, and must not touch the following bytes. */
UtAssert_True(CF_CFDP_GetMoveTarget("d", "ut", FileNameBuf, 1) == FileNameBuf,
"One-byte destination returns the supplied buffer");
UtAssert_ZERO(FileNameBuf[0]);
UtAssert_True(memcmp(FileNameBuf + 1, "XXXXX", sizeof(FileNameBuf) - 1) == 0, "Only the available byte is written");
UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0);

/* An exact fit preserves the complete path and the following byte. */
UtAssert_True(CF_CFDP_GetMoveTarget("d", "ut", FileNameBuf, 5) == FileNameBuf,
"Exact-fit destination returns the supplied buffer");
UtAssert_STRINGBUF_EQ(FileNameBuf, 5, "d/ut", -1);
UtAssert_INT32_EQ(FileNameBuf[5], 'X');
UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0);

/* nominal with dest dir */
UtAssert_NOT_NULL(CF_CFDP_GetMoveTarget("d", "ut", FileNameBuf, sizeof(FileNameBuf)));
UtAssert_STRINGBUF_EQ(FileNameBuf, sizeof(FileNameBuf), "d/ut", -1);
Expand Down
Loading