Skip to content

Fix static analysis blocker: bounds-guard m_directories in DpCatalog #4964

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
sympact06 wants to merge 2 commits into
base: devel
Choose a base branch
from
+4 −1
Open

Fix static analysis blocker: bounds-guard m_directories in DpCatalog #4964

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32afef0
fix: bounds-guard m_directories access in DpCatalog::fillBinaryTree (…
sympact06 Apr 7, 2026
273998b
Merge branch 'devel' into fix/dp-catalog-static-analysis-4521
sympact06 Apr 7, 2026
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
5 changes: 4 additions & 1 deletion Svc/DpCatalog/DpCatalog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,10 @@ Fw::CmdResponse DpCatalog::fillBinaryTree() {
FwSizeType totalFiles = 0;

// get file listings from file system
for (FwSizeType dir = 0; dir < this->m_numDirectories; dir++) {
const FwSizeType numDirs = (this->m_numDirectories <= DP_MAX_DIRECTORIES)
Copy link
Copy Markdown
Collaborator

@thomas-bc thomas-bc Apr 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It may be more readable to use std::min(this->m_numDirectories, DP_MAX_DIRECTORIES) ?

But also this is provable / asserted in configure() :

fprime/Svc/DpCatalog/DpCatalog.cpp

Line 57 in 5843907

FW_ASSERT(numDirs <= DP_MAX_DIRECTORIES, static_cast<FwAssertArgType>(numDirs));

My vote would be to dispose of this static analysis warning as a false positive

Copy link
Copy Markdown
Collaborator

@thomas-bc thomas-bc Apr 29, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't feel like the right fix to me. If m_numDirectories is more than DP_MAX_DIRECTORY, something majorly wrong is going on. Probably coding error, or bitflips or whatever. Silently clamping the range doesn't sound right. I vote we either ASSERT, or dispose of static analysis as false positive.

? this->m_numDirectories
: static_cast<FwSizeType>(DP_MAX_DIRECTORIES);
for (FwSizeType dir = 0; dir < numDirs; dir++) {
// read in each directory and keep track of total
this->log_ACTIVITY_LO_ProcessingDirectory(this->m_directories[dir]);
FwSizeType filesRead = 0;
Expand Down
Loading