Skip to content

Fix #13923 (Misra: Add --premium option misra-c-2025, do not fetch misra rule texts from premiumaddon) #7585

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.

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
merged 4 commits into from
Jun 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions cli/cmdlineparser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1145,6 +1145,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
"metrics",
"misra-c-2012",
"misra-c-2023",
"misra-c-2025",
"misra-c++-2008",
"misra-cpp-2008",
"misra-c++-2023",
Expand Down
2 changes: 0 additions & 2 deletions cli/cppcheckexecutor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -396,8 +396,6 @@ int CppCheckExecutor::check(int argc, const char* const argv[])
mFiles = parser.getFiles();
mFileSettings = parser.getFileSettings();

settings.setMisraRuleTexts(executeCommand);

const int ret = check_wrapper(settings, supprs);

return ret;
Expand Down
175 changes: 90 additions & 85 deletions gui/cppcheck_de.ts

Large diffs are not rendered by default.

175 changes: 90 additions & 85 deletions gui/cppcheck_es.ts

Large diffs are not rendered by default.

175 changes: 90 additions & 85 deletions gui/cppcheck_fi.ts

Large diffs are not rendered by default.

175 changes: 90 additions & 85 deletions gui/cppcheck_fr.ts

Large diffs are not rendered by default.

175 changes: 90 additions & 85 deletions gui/cppcheck_it.ts

Large diffs are not rendered by default.

175 changes: 90 additions & 85 deletions gui/cppcheck_ja.ts

Large diffs are not rendered by default.

175 changes: 90 additions & 85 deletions gui/cppcheck_ka.ts

Large diffs are not rendered by default.

175 changes: 90 additions & 85 deletions gui/cppcheck_ko.ts

Large diffs are not rendered by default.

175 changes: 90 additions & 85 deletions gui/cppcheck_nl.ts

Large diffs are not rendered by default.

175 changes: 90 additions & 85 deletions gui/cppcheck_ru.ts

Large diffs are not rendered by default.

175 changes: 90 additions & 85 deletions gui/cppcheck_sr.ts

Large diffs are not rendered by default.

175 changes: 90 additions & 85 deletions gui/cppcheck_sv.ts

Large diffs are not rendered by default.

175 changes: 90 additions & 85 deletions gui/cppcheck_zh_CN.ts

Large diffs are not rendered by default.

175 changes: 90 additions & 85 deletions gui/cppcheck_zh_TW.ts

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion gui/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1175,7 +1175,6 @@ bool MainWindow::getCppcheckSettings(Settings& settings, Suppressions& supprs)
if (!premiumArgs.contains("--misra-c-") && mProjectFile->getAddons().contains("misra"))
premiumArgs += " --misra-c-2012";
settings.premiumArgs = premiumArgs.mid(1).toStdString();
settings.setMisraRuleTexts(CheckThread::executeCommand);
}
}
else
Expand Down
5 changes: 5 additions & 0 deletions gui/projectfile.ui
Original file line number Diff line number Diff line change
Expand Up @@ -846,6 +846,11 @@
<string>2023</string>
</property>
</item>
<item>
<property name="text">
<string>2025</string>
</property>
</item>
</widget>
</item>
<item>
Expand Down
12 changes: 11 additions & 1 deletion gui/projectfiledialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@

static constexpr char ADDON_MISRA[] = "misra";
static constexpr char CODING_STANDARD_MISRA_C_2023[] = "misra-c-2023";
static constexpr char CODING_STANDARD_MISRA_C_2025[] = "misra-c-2025";
static constexpr char CODING_STANDARD_MISRA_CPP_2008[] = "misra-cpp-2008";
static constexpr char CODING_STANDARD_MISRA_CPP_2023[] = "misra-cpp-2023";
static constexpr char CODING_STANDARD_CERT_C[] = "cert-c-2016";
Expand Down Expand Up @@ -396,7 +397,14 @@ void ProjectFileDialog::loadFromProjectFile(const ProjectFile *projectFile)
const QString &misraFile = settings.value(SETTINGS_MISRA_FILE, QString()).toString();
mUI->mEditMisraFile->setText(misraFile);
mUI->mMisraVersion->setVisible(mPremium);
mUI->mMisraVersion->setCurrentIndex(projectFile->getCodingStandards().contains(CODING_STANDARD_MISRA_C_2023));
if (projectFile->getCodingStandards().contains(CODING_STANDARD_MISRA_C_2023))
mUI->mMisraVersion->setCurrentIndex(1);
else if (projectFile->getCodingStandards().contains(CODING_STANDARD_MISRA_C_2025))
mUI->mMisraVersion->setCurrentIndex(2);
else if (projectFile->getAddons().contains(ADDON_MISRA))
mUI->mMisraVersion->setCurrentIndex(0);
else
mUI->mMisraVersion->setCurrentIndex(-1);
if (mPremium) {
mUI->mLabelMisraFile->setVisible(false);
mUI->mEditMisraFile->setVisible(false);
Expand Down Expand Up @@ -519,6 +527,8 @@ void ProjectFileDialog::saveToProjectFile(ProjectFile *projectFile) const
codingStandards << CODING_STANDARD_CERT_CPP;
if (mPremium && mUI->mMisraVersion->currentIndex() == 1)
codingStandards << CODING_STANDARD_MISRA_C_2023;
if (mPremium && mUI->mMisraVersion->currentIndex() == 2)
codingStandards << CODING_STANDARD_MISRA_C_2025;
if (mUI->mMisraCpp->isChecked() && mUI->mMisraCppVersion->currentIndex() == 0)
codingStandards << CODING_STANDARD_MISRA_CPP_2008;
if (mUI->mMisraCpp->isChecked() && mUI->mMisraCppVersion->currentIndex() == 1)
Expand Down
22 changes: 12 additions & 10 deletions lib/checkersidmapping.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
// This file is auto generated by script, do not edit
// Mappings of Cppcheck warning IDs to guidelines
#include "checkers.h"

#include <vector>

std::vector<checkers::IdMapping> checkers::idMappingAutosar{
Expand Down Expand Up @@ -79,8 +78,10 @@ std::vector<checkers::IdMapping> checkers::idMappingCertC{
{"EXP34", "nullPointer,nullPointerDefaultArg,nullPointerRedundantCheck,nullPointerArithmetic,nullPointerArithmeticRedundantCheck"},
{"EXP44", "sizeofCalculation"},
{"EXP46", "bitwiseOnBoolean"},
{"INT32", "integerOverflow"},
{"FLP32", "invalidFunctionArg"},
{"FLP34", "floatConversionOverflow"},
{"ARR30", "arrayIndexOutOfBounds,arrayIndexOutOfBoundsCond,pointerOutOfBounds,pointerOutOfBoundsCond,negativeIndex,arrayIndexThenCheck,bufferAccessOutOfBounds,objectIndex,argumentSize"},
{"ARR36", "comparePointers"},
{"STR30", "stringLiteralWrite"},
{"STR37", "invalidFunctionArg"},
Expand All @@ -95,28 +96,28 @@ std::vector<checkers::IdMapping> checkers::idMappingCertC{
};

std::vector<checkers::IdMapping> checkers::idMappingCertCpp{
{"CTR51", "eraseDereference"},
{"CTR54", "comparePointers"},
{"CTR55", "containerOutOfBounds"},
{"DCL57", "deallocThrow,exceptThrowInDestructor"},
{"DCL60", "ctuOneDefinitionRuleViolation"},
{"ERR57", "memleak"},
{"EXP52", "sizeofCalculation"},
{"EXP53", "uninitvar"},
{"EXP53", "uninitvar,uninitdata,uninitStructMember"},
{"EXP54", "uninitvar,danglingLifetime,danglingReference,danglingTemporaryLifetime,danglingTempReference,returnDanglingLifetime"},
{"EXP61", "danglingLifetime,danglingReference,danglingTemporaryLifetime,danglingTempReference,returnDanglingLifetime"},
{"EXP63", "accessMoved"},
{"CTR51", "eraseDereference"},
{"CTR54", "comparePointers"},
{"CTR55", "containerOutOfBounds"},
{"STR51", "nullPointer"},
{"STR52", "invalidContainer"},
{"FIO50", "IOWithoutPositioning"},
{"MEM50", "deallocuse"},
{"MEM51", "mismatchAllocDealloc"},
{"MEM56", "doubleFree"},
{"FIO50", "IOWithoutPositioning"},
{"ERR57", "memleak"},
{"MSC52", "missingReturn"},
{"OOP50", "virtualCallInConstructor"},
{"OOP52", "virtualDestructor"},
{"OOP53", "initializerList"},
{"OOP54", "operatorEqToSelf"},
{"MSC52", "missingReturn"},
{"STR51", "nullPointer"},
{"STR52", "invalidContainer"},
};

std::vector<checkers::IdMapping> checkers::idMappingMisraC{
Expand Down Expand Up @@ -192,6 +193,7 @@ std::vector<checkers::IdMapping> checkers::idMappingMisraCpp2023{
{"0.0.1", "unreachableCode"},
{"0.0.2", "compareBoolExpressionWithInt,compareValueOutOfTypeRangeError,identicalConditionAfterEarlyExit,identicalInnerCondition,knownConditionTrueFalse"},
{"0.1.1", "redundantAssignInSwitch,redundantAssignment,redundantCopy,redundantInitialization,unreadVariable"},
{"Dir 0.3.1", "floatConversionOverflow"},
{"Dir 0.3.2", "invalidFunctionArg,invalidFunctionArgBool,invalidFunctionArgStr"},
{"4.1.3", "error"},
{"4.6.1", "unknownEvaluationOrder"},
Expand Down
6 changes: 4 additions & 2 deletions lib/checkersreport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,12 @@ static bool isCppcheckPremium(const Settings& settings) {
}

static int getMisraCVersion(const Settings& settings) {
if (settings.premiumArgs.find("misra-c-2012") != std::string::npos)
return 2012;
if (settings.premiumArgs.find("misra-c-2025") != std::string::npos)
return 2025;
if (settings.premiumArgs.find("misra-c-2023") != std::string::npos)
return 2023;
if (settings.premiumArgs.find("misra-c-2012") != std::string::npos)
return 2012;
if (settings.addons.count("misra"))
return 2012;
const bool misraAddonInfo = std::any_of(settings.addonInfos.cbegin(), settings.addonInfos.cend(), [](const AddonInfo& addonInfo) {
Expand Down
12 changes: 3 additions & 9 deletions lib/cppcheck.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1732,8 +1732,6 @@ void CppCheck::executeAddons(const std::vector<std::string>& files, const std::s
mErrorLogger.reportErr(errmsg);
}

const bool misraC2023 = mSettings.premiumArgs.find("--misra-c-2023") != std::string::npos;

for (const picojson::value& res : results) {
// TODO: get rid of copy?
// this is a copy so we can access missing fields and get a default value
Expand Down Expand Up @@ -1789,9 +1787,7 @@ void CppCheck::executeAddons(const std::vector<std::string>& files, const std::s
}

errmsg.id = obj["addon"].get<std::string>() + "-" + obj["errorId"].get<std::string>();
if (misraC2023 && startsWith(errmsg.id, "misra-c2012-"))
errmsg.id = "misra-c2023-" + errmsg.id.substr(12);
errmsg.setmsg(mSettings.getMisraRuleText(errmsg.id, obj["message"].get<std::string>()));
errmsg.setmsg(obj["message"].get<std::string>());
const std::string severity = obj["severity"].get<std::string>();
errmsg.severity = severityFromString(severity);
if (errmsg.severity == Severity::none || errmsg.severity == Severity::internal) {
Expand Down Expand Up @@ -2122,10 +2118,8 @@ void CppCheck::printTimerResults(SHOWTIME_MODES mode)
}

bool CppCheck::isPremiumCodingStandardId(const std::string& id) const {
if (mSettings.premiumArgs.find("--misra") != std::string::npos) {
if (startsWith(id, "misra-") || startsWith(id, "premium-misra-"))
return true;
}
if (mSettings.premiumArgs.find("--misra") != std::string::npos && startsWith(id, "premium-misra-"))
return true;
if (mSettings.premiumArgs.find("--cert") != std::string::npos && startsWith(id, "premium-cert-"))
return true;
if (mSettings.premiumArgs.find("--autosar") != std::string::npos && startsWith(id, "premium-autosar-"))
Expand Down
103 changes: 57 additions & 46 deletions lib/settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -392,15 +392,21 @@ static const std::set<std::string> autosarCheckers{

static const std::set<std::string> certCCheckers{
"IOWithoutPositioning",
"argumentSize",
"arrayIndexOutOfBounds",
"arrayIndexOutOfBoundsCond",
"arrayIndexThenCheck",
"autoVariables",
"autovarInvalidDeallocation",
"bitwiseOnBoolean",
"bufferAccessOutOfBounds",
"comparePointers",
"danglingLifetime",
"deallocret",
"deallocuse",
"doubleFree",
"floatConversionOverflow",
"integerOverflow",
"invalidFunctionArg",
"invalidLengthModifierError",
"invalidLifetime",
Expand All @@ -412,11 +418,15 @@ static const std::set<std::string> certCCheckers{
"memleakOnRealloc",
"mismatchAllocDealloc",
"missingReturn",
"negativeIndex",
"nullPointer",
"nullPointerArithmetic",
"nullPointerArithmeticRedundantCheck",
"nullPointerDefaultArg",
"nullPointerRedundantCheck",
"objectIndex",
"pointerOutOfBounds",
"pointerOutOfBoundsCond",
"preprocessorErrorDirective",
"resourceLeak",
"returnDanglingLifetime",
Expand Down Expand Up @@ -455,6 +465,8 @@ static const std::set<std::string> certCppCheckers{
"operatorEqToSelf",
"returnDanglingLifetime",
"sizeofCalculation",
"uninitStructMember",
"uninitdata",
"uninitvar",
"virtualCallInConstructor",
"virtualDestructor"
Expand Down Expand Up @@ -546,6 +558,49 @@ static const std::set<std::string> misrac2023Checkers{
"writeReadOnlyFile"
};

static const std::set<std::string> misrac2025Checkers{
"argumentSize",
"autovarInvalidDeallocation",
"bufferAccessOutOfBounds",
"comparePointers",
"compareValueOutOfTypeRangeError",
"constParameterPointer",
"constStatement",
"danglingLifetime",
"danglingTemporaryLifetime",
"duplicateBreak",
"funcArgNamesDifferent",
"incompatibleFileOpen",
"invalidFunctionArg",
"knownConditionTrueFalse",
"leakNoVarFunctionCall",
"leakReturnValNotUsed",
"memleak",
"memleakOnRealloc",
"missingReturn",
"overlappingWriteFunction",
"overlappingWriteUnion",
"pointerOutOfBounds",
"preprocessorErrorDirective",
"redundantAssignInSwitch",
"redundantAssignment",
"redundantCondition",
"resourceLeak",
"returnDanglingLifetime",
"shadowVariable",
"sizeofCalculation",
"sizeofwithsilentarraypointer",
"syntaxError",
"uninitvar",
"unknownEvaluationOrder",
"unreachableCode",
"unreadVariable",
"unusedLabel",
"unusedVariable",
"useClosedFile",
"writeReadOnlyFile"
};

static const std::set<std::string> misracpp2008Checkers{
"autoVariables",
"comparePointers",
Expand Down Expand Up @@ -602,6 +657,7 @@ static const std::set<std::string> misracpp2023Checkers{
"constParameterReference",
"ctuOneDefinitionRuleViolation",
"danglingLifetime",
"floatConversionOverflow",
"identicalConditionAfterEarlyExit",
"identicalInnerCondition",
"ignoredReturnValue",
Expand Down Expand Up @@ -639,7 +695,7 @@ bool Settings::isPremiumEnabled(const char id[]) const
return true;
if (premiumArgs.find("cert-c++") != std::string::npos && certCppCheckers.count(id))
return true;
if (premiumArgs.find("misra-c-") != std::string::npos && (misrac2012Checkers.count(id) || misrac2023Checkers.count(id)))
if (premiumArgs.find("misra-c-") != std::string::npos && (misrac2012Checkers.count(id) || misrac2023Checkers.count(id) || misrac2025Checkers.count(id)))
return true;
if (premiumArgs.find("misra-c++-2008") != std::string::npos && misracpp2008Checkers.count(id))
return true;
Expand All @@ -648,51 +704,6 @@ bool Settings::isPremiumEnabled(const char id[]) const
return false;
}

void Settings::setMisraRuleTexts(const ExecuteCmdFn& executeCommand)
{
if (premiumArgs.find("--misra-c-20") != std::string::npos) {
const auto it = std::find_if(addonInfos.cbegin(), addonInfos.cend(), [](const AddonInfo& a) {
return a.name == "premiumaddon.json";
});
if (it != addonInfos.cend()) {
std::string arg;
if (premiumArgs.find("--misra-c-2023") != std::string::npos)
arg = "--misra-c-2023-rule-texts";
else
arg = "--misra-c-2012-rule-texts";
std::string output;
executeCommand(it->executable, {std::move(arg)}, "2>&1", output);
setMisraRuleTexts(output);
}
}
}

void Settings::setMisraRuleTexts(const std::string& data)
{
mMisraRuleTexts.clear();
std::istringstream istr(data);
std::string line;
while (std::getline(istr, line)) {
std::string::size_type pos = line.find(' ');
if (pos == std::string::npos)
continue;
std::string id = line.substr(0, pos);
std::string text = line.substr(pos + 1);
if (id.empty() || text.empty())
continue;
if (text[text.size() -1] == '\r')
text.erase(text.size() -1);
mMisraRuleTexts[id] = std::move(text);
}
}

std::string Settings::getMisraRuleText(const std::string& id, const std::string& text) const {
if (id.compare(0, 9, "misra-c20") != 0)
return text;
const auto it = mMisraRuleTexts.find(id.substr(id.rfind('-') + 1));
return it != mMisraRuleTexts.end() ? it->second : text;
}

Settings::ExecutorType Settings::defaultExecutor()
{
static constexpr ExecutorType defaultExecutor =
Expand Down
5 changes: 0 additions & 5 deletions lib/settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -543,17 +543,12 @@ class CPPCHECKLIB WARN_UNUSED Settings {

void setCheckLevel(CheckLevel level);

using ExecuteCmdFn = std::function<int (std::string,std::vector<std::string>,std::string,std::string&)>;
void setMisraRuleTexts(const ExecuteCmdFn& executeCommand);
void setMisraRuleTexts(const std::string& data);
std::string getMisraRuleText(const std::string& id, const std::string& text) const;

static ExecutorType defaultExecutor();

private:
static std::string parseEnabled(const std::string &str, std::tuple<SimpleEnableGroup<Severity>, SimpleEnableGroup<Checks>> &groups);
std::string applyEnabled(const std::string &str, bool enable);
std::map<std::string, std::string> mMisraRuleTexts;
};

/// @}
Expand Down
Loading
Loading