fixed #13542 - added CLI option --emit-duplicates to allow showing …

…duplicated findings (#7201)
danmar · Jan 11, 2025 · 7dc579a · 7dc579a
1 parent a5cf0dd
commit 7dc579a
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 2 deletions.
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -666,6 +666,9 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
             else if (std::strcmp(argv[i], "--dump") == 0)
                 mSettings.dump = true;
 
+            else if (std::strcmp(argv[i], "--emit-duplicates") == 0)
+                mSettings.emitDuplicates = true;
+
             else if (std::strncmp(argv[i], "--enable=", 9) == 0) {
                 const std::string enable_arg = argv[i] + 9;
                 const std::string errmsg = mSettings.addEnabled(enable_arg);

diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
@@ -623,7 +623,7 @@ void StdLogger::reportErr(const ErrorMessage &msg)
     // TODO: we generate a different message here then we log below
     // TODO: there should be no need for verbose and default messages here
     // Alert only about unique errors
-    if (!mShownErrors.insert(msg.toString(mSettings.verbose)).second)
+    if (!mSettings.emitDuplicates && !mShownErrors.insert(msg.toString(mSettings.verbose)).second)
         return;
 
     if (mSettings.outputFormat == Settings::OutputFormat::sarif)

diff --git a/cli/executor.cpp b/cli/executor.cpp
@@ -50,6 +50,9 @@ bool Executor::hasToLog(const ErrorMessage &msg)
         if (errmsg.empty())
             return false;
 
+        if (mSettings.emitDuplicates)
+            return true;
+
         std::lock_guard<std::mutex> lg(mErrorListSync);
         if (mErrorList.emplace(std::move(errmsg)).second) {
             return true;

diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -209,7 +209,7 @@ class CppCheck::CppCheckLogger : public ErrorLogger
         // Alert only about unique errors.
         // This makes sure the errors of a single check() call are unique.
         // TODO: get rid of this? This is forwarded to another ErrorLogger which is also doing this
-        if (!mErrorList.emplace(std::move(errmsg)).second)
+        if (!mSettings.emitDuplicates && !mErrorList.emplace(std::move(errmsg)).second)
             return;
 
         if (mAnalyzerInformation)

diff --git a/lib/settings.h b/lib/settings.h
@@ -208,6 +208,9 @@ class CPPCHECKLIB WARN_UNUSED Settings {
     /** @brief Is --dump given? */
     bool dump{};
 
+    /** @brief Do not filter duplicated errors. */
+    bool emitDuplicates{};
+
     /** @brief Name of the language that is enforced. Empty per default. */
     Standards::Language enforcedLang{};
 

diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp
@@ -421,6 +421,7 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(debugLookupPlatform);
         TEST_CASE(maxTemplateRecursion);
         TEST_CASE(maxTemplateRecursionMissingCount);
+        TEST_CASE(emitDuplicates);
 
         TEST_CASE(ignorepaths1);
         TEST_CASE(ignorepaths2);
@@ -2899,6 +2900,13 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS("cppcheck: error: argument to '--max-template-recursion=' is not valid - not an integer.\n", logger->str());
     }
 
+    void emitDuplicates() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--emit-duplicates", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(true, settings->emitDuplicates);
+    }
+
     void ignorepaths1() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-isrc", "file.cpp"};