Skip to content

Add check for npos, when checkInternal receives file with missing dot #7911

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

Merged
danmar merged 6 commits into from
Oct 28, 2025
Merged

Add check for npos, when checkInternal receives file with missing dot #7911

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a1ba232
Add check for npos, when checkInternal receives file with missing dot
GNL10 Oct 25, 2025
5ae2a1c
Fix formatting error
GNL10 Oct 27, 2025
ef4cffa
Add filename to error message
GNL10 Oct 27, 2025
8a47971
Removed logic to reportErr in checkPlistOutput.
GNL10 Oct 27, 2025
273da5c
Fix minor typo
GNL10 Oct 27, 2025
67f144b
Add hash calculation to UT due to hashing functions differing between…
GNL10 Oct 28, 2025
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
33 changes: 23 additions & 10 deletions lib/cppcheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,6 +884,27 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string
return checkInternal(file, cfgname, fileIndex, f);
}

bool CppCheck::checkPlistOutput(const FileWithDetails& file, const std::vector<std::string>& files)
{
if (!mSettings.plistOutput.empty()) {
const bool slashFound = file.spath().find('/') != std::string::npos;
std::string filename = slashFound ? file.spath().substr(file.spath().rfind('/') + 1) : file.spath();
const std::size_t dotPosition = filename.find('.');

if (dotPosition == std::string::npos) {
ErrorMessage::FileLocation loc(filename, 0, 0);
Comment thread
GNL10 marked this conversation as resolved.
Outdated
ErrorMessage errmsg({std::move(loc)}, "", Severity::error, "Filename '" + filename + "' does not contain dot", "filenameError", Certainty::normal);
mErrorLogger.reportErr(errmsg);
return false;
}

const std::size_t fileNameHash = std::hash<std::string> {}(file.spath());
filename = mSettings.plistOutput + filename.substr(0, filename.find('.')) + "_" + std::to_string(fileNameHash) + ".plist";
Comment thread
GNL10 marked this conversation as resolved.
Outdated
mLogger->openPlist(filename, files);
}
return true;
}

unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::string &cfgname, int fileIndex, const CreateTokenListFn& createTokenList)
{
// TODO: move to constructor when CppCheck no longer owns the settings
Expand Down Expand Up @@ -989,16 +1010,8 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
if (!preprocessor.loadFiles(tokens1, files))
return mLogger->exitcode();

if (!mSettings.plistOutput.empty()) {
std::string filename2;
if (file.spath().find('/') != std::string::npos)
filename2 = file.spath().substr(file.spath().rfind('/') + 1);
else
filename2 = file.spath();
const std::size_t fileNameHash = std::hash<std::string> {}(file.spath());
filename2 = mSettings.plistOutput + filename2.substr(0, filename2.find('.')) + "_" + std::to_string(fileNameHash) + ".plist";
mLogger->openPlist(filename2, files);
}
if (!checkPlistOutput(file, files))
return mLogger->exitcode();

std::string dumpProlog;
if (mSettings.dump || !mSettings.addons.empty()) {
Expand Down
2 changes: 2 additions & 0 deletions lib/cppcheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,8 @@ class CPPCHECKLIB CppCheck {
*/
unsigned int checkFile(const FileWithDetails& file, const std::string &cfgname, int fileIndex);

bool checkPlistOutput(const FileWithDetails& file, const std::vector<std::string>& files);

/**
* @brief Check a file using buffer
* @param file the file
Expand Down
28 changes: 28 additions & 0 deletions test/testcppcheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ class TestCppcheck : public TestFixture {
TEST_CASE(isPremiumCodingStandardId);
TEST_CASE(getDumpFileContentsRawTokens);
TEST_CASE(getDumpFileContentsLibrary);
TEST_CASE(checkPlistOutput);
TEST_CASE(premiumResultsCache);
TEST_CASE(toomanyconfigs);
TEST_CASE(purgedConfiguration);
Expand Down Expand Up @@ -522,6 +523,33 @@ class TestCppcheck : public TestFixture {
}
}

void checkPlistOutput() const {
Suppressions supprs;
ErrorLogger2 errorLogger;
std::vector<std::string> files = {"file.txt"};

{
const auto s = dinit(Settings, $.templateFormat = templateFormat, $.plistOutput = "output");
ScopedFile file("file", "");
CppCheck cppcheck(s, supprs, errorLogger, false, {});
ASSERT_EQUALS(false, cppcheck.checkPlistOutput(FileWithDetails(file.path(), Path::identify(file.path(), false), 0), files));
}

{
const auto s = dinit(Settings, $.plistOutput = "output");
ScopedFile file("file.c", "");
CppCheck cppcheck(s, supprs, errorLogger, false, {});
ASSERT_EQUALS(true, cppcheck.checkPlistOutput(FileWithDetails(file.path(), Path::identify(file.path(), false), 0), files));
}

{
Settings s;
ScopedFile file("file.c", "");
CppCheck cppcheck(s, supprs, errorLogger, false, {});
ASSERT_EQUALS(true, cppcheck.checkPlistOutput(FileWithDetails(file.path(), Path::identify(file.path(), false), 0), files));
}
}

void premiumResultsCache() const {
// Trac #13889 - cached misra results are shown after removing --premium=misra-c-2012 option

Expand Down
Loading