fix #13730

Author: ludviggunne

cli/cppcheckexecutor.cpp

@@ -670,7 +670,7 @@ void StdLogger::reportErr(const ErrorMessage &msg)
     ErrorMessage msgCopy = msg;
     msgCopy.guideline = getGuideline(msgCopy.id, mSettings.reportType,
                                      mGuidelineMapping, msgCopy.severity);
-    msgCopy.classification = getClassification(msgCopy.guideline, mSettings.reportType);
+    msgCopy.classification = getClassification(msgCopy.id, msgCopy.guideline, mSettings.reportType);
 
     // TODO: there should be no need for verbose and default messages here
     const std::string msgStr = msgCopy.toString(mSettings.verbose, mSettings.templateFormat, mSettings.templateLocation);

lib/errorlogger.cpp

@@ -925,7 +925,7 @@ void substituteTemplateLocationStatic(std::string& templateLocation)
     replaceColors(templateLocation);
 }
 
-std::string getClassification(const std::string &guideline, ReportType reportType) {
+std::string getClassification(const std::string &errId, const std::string &guideline, ReportType reportType) {
     if (guideline.empty())
         return "";
 
@@ -954,15 +954,16 @@ std::string getClassification(const std::string &guideline, ReportType reportTyp
         const int a = std::stoi(components[0]);
         const int b = std::stoi(components[1]);
 
-        const std::vector<checkers::MisraInfo> &info = checkers::misraC2012Rules;
+        const bool isDirective = errId.find("dir") != std::string::npos;
+        const std::vector<checkers::MisraInfo> &info = isDirective ? checkers::misraC2012Directives : checkers::misraC2012Rules;
         const auto it = std::find_if(info.cbegin(), info.cend(), [&](const checkers::MisraInfo &i) {
                 return i.a == a && i.b == b;
             });
 
-        if (it == info.cend())
-            return "";
+        if (it != info.cend())
+            return it->str;
 
-        return it->str;
+        return "";
     }
     case ReportType::misraCpp2008:
     case ReportType::misraCpp2023:

lib/errorlogger.h

@@ -295,7 +295,7 @@ CPPCHECKLIB void substituteTemplateFormatStatic(std::string& templateFormat);
 CPPCHECKLIB void substituteTemplateLocationStatic(std::string& templateLocation);
 
 /** Get a classification string from the given guideline and reporttype */
-CPPCHECKLIB std::string getClassification(const std::string &guideline, ReportType reportType);
+CPPCHECKLIB std::string getClassification(const std::string &errId, const std::string &guideline, ReportType reportType);
 
 /** Get a guidline string froM the given error id, reporttype, mapping and severity */
 CPPCHECKLIB std::string getGuideline(const std::string &errId, ReportType reportType,

test/testerrorlogger.cpp

@@ -323,7 +323,7 @@ class TestErrorLogger : public TestFixture {
         const std::string format = "{severity} {id}";
         ErrorMessage msg(std::move(locs), emptyString, Severity::error, "", "unusedVariable", Certainty::normal);
         msg.guideline = getGuideline(msg.id, reportType, mapping, msg.severity);
-        msg.classification = getClassification(msg.guideline, reportType);
+        msg.classification = getClassification(msg.id, msg.guideline, reportType);
         ASSERT_EQUALS("Advisory", msg.classification);
         ASSERT_EQUALS("2.8", msg.guideline);
         ASSERT_EQUALS("Advisory 2.8", msg.toString(true, format, ""));
@@ -349,7 +349,7 @@ class TestErrorLogger : public TestFixture {
         const std::string format = "{severity} {id}";
         ErrorMessage msg(std::move(locs), emptyString, Severity::error, "", "resourceLeak", Certainty::normal);
         msg.guideline = getGuideline(msg.id, reportType, mapping, msg.severity);
-        msg.classification = getClassification(msg.guideline, reportType);
+        msg.classification = getClassification(msg.id, msg.guideline, reportType);
         ASSERT_EQUALS("L3", msg.classification);
         ASSERT_EQUALS("FIO42-C", msg.guideline);
         ASSERT_EQUALS("L3 FIO42-C", msg.toString(true, format, ""));