From 66a734b481486962ef4d2f97192212a24ca0dbe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Mon, 11 Oct 2021 19:26:51 +0200
Subject: [PATCH] Allow compiled addons

---
 lib/cppcheck.cpp | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
index 1f8dd3e92..3f1d283c2 100644
--- a/lib/cppcheck.cpp
+++ b/lib/cppcheck.cpp
@@ -68,9 +68,10 @@ static const CWE CWE398(398U);  // Indicator of Poor Code Quality
 namespace {
     struct AddonInfo {
         std::string name;
-        std::string scriptFile;
-        std::string args;
-        std::string python;
+        std::string scriptFile; // addon script
+        std::string executable; // addon executable
+        std::string args;       // special extra arguments
+        std::string python;     // script interpreter
         bool ctu = false;
         std::string runScript{};
 
@@ -111,7 +112,7 @@ namespace {
             if (obj.count("ctu")) {
                 // ctu is specified in the config file
                 if (!obj["ctu"].is<bool>())
-                    return "Loading " + fileName + " failed. ctu must be array.";
+                    return "Loading " + fileName + " failed. ctu must be boolean.";
                 ctu = obj["ctu"].get<bool>();
             } else {
                 ctu = false;
@@ -127,6 +128,13 @@ namespace {
                 python = "";
             }
 
+            if (obj.count("executable")) {
+                if (!obj["executable"].is<std::string>())
+                    return "Loading " + fileName + " failed. executable must be a string.";
+                executable = obj["executable"].get<std::string>();
+                return "";
+            }
+
             return getAddonInfo(obj["script"].get<std::string>(), exename);
         }
 
@@ -273,7 +281,9 @@ static std::string executeAddon(const AddonInfo &addonInfo,
 
     std::string pythonExe;
 
-    if (!addonInfo.python.empty())
+    if (!addonInfo.executable.empty())
+        pythonExe = addonInfo.executable;
+    else if (!addonInfo.python.empty())
         pythonExe = cmdFileName(addonInfo.python);
     else if (!defaultPythonExe.empty())
         pythonExe = cmdFileName(defaultPythonExe);
@@ -294,9 +304,13 @@ static std::string executeAddon(const AddonInfo &addonInfo,
             throw InternalError(nullptr, "Failed to auto detect python");
     }
 
+    std::string args;
+    if (addonInfo.executable.empty())
+        args = cmdFileName(addonInfo.runScript) + " " + cmdFileName(addonInfo.scriptFile);
+    args += std::string(args.empty() ? "" : " ") + "--cli" + addonInfo.args;
+
     const std::string fileArg = (endsWith(file, FILELIST, sizeof(FILELIST)-1) ? " --file-list " : " ") + cmdFileName(file);
-    const std::string args =
-        cmdFileName(addonInfo.runScript) + " " + cmdFileName(addonInfo.scriptFile) + " --cli" + addonInfo.args + fileArg;
+    args += fileArg;
 
     std::string result;
     if (!executeCommand(pythonExe, split(args), redirect, &result))