Fix #13047 (....)

danmar · Aug 29, 2024 · c3f0b3e · c3f0b3e
1 parent e6b0081
commit c3f0b3e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -628,6 +628,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
             else if (std::strncmp(argv[i], "--error-exitcode=", 17) == 0) {
                 if (!parseNumberArg(argv[i], 17, mSettings.exitCode))
                     return Result::Fail;
+                mSettings.errorExitCode0 = (!mSettings.safety && mSettings.exitCode == 0);
             }
 
             // Exception handling inside cppcheck client
@@ -996,8 +997,10 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                     "bughunting",
                     "safety"};
 
-                if (std::strcmp(argv[i], "--premium=safety") == 0)
+                if (std::strcmp(argv[i], "--premium=safety") == 0) {
                     mSettings.safety = true;
+                    mSettings.errorExitCode0 = false;
+                }
                 if (!mSettings.premiumArgs.empty())
                     mSettings.premiumArgs += " ";
                 const std::string p(argv[i] + 10);
@@ -1222,8 +1225,10 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
             }
 
             // Safety certified behavior
-            else if (std::strcmp(argv[i], "--safety") == 0)
+            else if (std::strcmp(argv[i], "--safety") == 0) {
                 mSettings.safety = true;
+                mSettings.errorExitCode0 = false;
+            }
 
             // show timing information..
             else if (std::strncmp(argv[i], "--showtime=", 11) == 0) {

diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
@@ -311,8 +311,12 @@ int CppCheckExecutor::check_internal(const Settings& settings) const
         stdLogger.reportErr(ErrorMessage::getXMLFooter());
     }
 
-    if (settings.safety && (stdLogger.hasCriticalErrors() || returnValue != 0))
+    if (settings.safety && stdLogger.hasCriticalErrors()) {
+        const bool isSafeVersion = endsWith(settings.cppcheckCfgProductName, 'S') || endsWith(settings.cppcheckCfgProductName, 's');
+        if (settings.errorExitCode0 && !isSafeVersion)
+            return EXIT_SUCCESS;
         return EXIT_FAILURE;
+    }
 
     if (returnValue)
         return settings.exitCode;

diff --git a/lib/settings.h b/lib/settings.h
@@ -232,6 +232,9 @@ class CPPCHECKLIB WARN_UNUSED Settings {
         Default value is 0. */
     int exitCode{};
 
+    /** @brief was --error-exitcode=0 used on the command line? */
+    bool errorExitCode0{};
+
     /** @brief List of --file-filter for analyzing special files */
     std::vector<std::string> fileFilters;