Merge pull request #38 from skliper/fix36-redundant_length_check

Fix #36, Remove redundant conditional to support full coverage
nasa · Jun 22, 2022 · d2bffb4 · d2bffb4
2 parents 4336824 + 14a4ef8
commit d2bffb4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/fsw/src/fm_child.c b/fsw/src/fm_child.c
@@ -1272,7 +1272,7 @@ void FM_ChildDirListPktCmd(const FM_ChildQueueEntry_t *CmdArgs)
                     EntryLength = strlen(OS_DIRENTRY_NAME(DirEntry));
 
                     /* Verify combined directory plus filename length */
-                    if ((EntryLength < sizeof(ListEntry->EntryName)) && ((PathLength + EntryLength) < OS_MAX_PATH_LEN))
+                    if ((PathLength + EntryLength) < OS_MAX_PATH_LEN)
                     {
                         /* Add filename to directory listing telemetry packet */
                         strncpy(ListEntry->EntryName, OS_DIRENTRY_NAME(DirEntry), EntryLength);
@@ -1282,7 +1282,7 @@ void FM_ChildDirListPktCmd(const FM_ChildQueueEntry_t *CmdArgs)
                         strncpy(LogicalName, CmdArgs->Source2, PathLength);
                         LogicalName[PathLength] = '\0';
 
-                        strncat(LogicalName, OS_DIRENTRY_NAME(DirEntry), (OS_MAX_PATH_LEN - PathLength));
+                        strncat(LogicalName, OS_DIRENTRY_NAME(DirEntry), EntryLength);
 
                         FM_ChildSleepStat(LogicalName, ListEntry, &FilesTillSleep, CmdArgs->GetSizeTimeMode);