Fix plist filenames

Author: glankk

lib/cppcheck.cpp

@@ -123,11 +123,15 @@ class CppCheck::CppCheckLogger : public ErrorLogger
         mErrorList.clear();
     }
 
-    void openPlist(const std::string& filename, const std::vector<std::string>* files)
+    void openPlist(const std::string& filename)
     {
         mPlistFile.open(filename);
         mPlistFile << ErrorLogger::plistHeader(version());
-        mPlistFilenames = files;
+    }
+
+    void setPlistFilenames(std::vector<std::string> files)
+    {
+        mPlistFilenames = std::move(files);
     }
 
     void closePlist()
@@ -276,8 +280,8 @@ class CppCheck::CppCheckLogger : public ErrorLogger
     using Location = std::pair<std::string, int>;
     std::map<Location, std::set<std::string>> mLocationMacros; // What macros are used on a location?
 
-    const std::vector<std::string>* mPlistFilenames{};
     std::ofstream mPlistFile;
+    std::vector<std::string> mPlistFilenames;
 
     unsigned int mExitCode{};
 
@@ -996,7 +1000,7 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
                 filename2 = file.spath();
             const std::size_t fileNameHash = std::hash<std::string> {}(file.spath());
             filename2 = mSettings.plistOutput + filename2.substr(0, filename2.find('.')) + "_" + std::to_string(fileNameHash) + ".plist";
-            mLogger->openPlist(filename2, &files);
+            mLogger->openPlist(filename2);
         }
 
         // Parse comments and then remove them
@@ -1289,6 +1293,10 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
             fdump.close();
         }
 
+        if (!mSettings.plistOutput.empty()) {
+            mLogger->setPlistFilenames(std::move(files));
+        }
+
         executeAddons(dumpFile, file);
     } catch (const TerminateException &) {
         // Analysis is terminated

lib/errorlogger.h

@@ -271,15 +271,13 @@ class CPPCHECKLIB ErrorLogger {
 
     static std::string plistHeader(const std::string &version);
     static std::string plistData(const ErrorMessage &msg);
-    static std::string plistFooter(const std::vector<std::string> *files) {
+    static std::string plistFooter(const std::vector<std::string>& files) {
         std::ostringstream ostr;
         ostr << " </array>\r\n"
-             << " <key>files</key>\r\n"
-             << " <array>\r\n";
-        if (files) {
-            for (const std::string& file : *files)
-                ostr << "  <string>" << ErrorLogger::toxml(file) << "</string>\r\n";
-        }
+            << " <key>files</key>\r\n"
+            << " <array>\r\n";
+        for (const std::string& file : files)
+            ostr << "  <string>" << ErrorLogger::toxml(file) << "</string>\r\n";
         ostr << " </array>\r\n"
              << "</dict>\r\n"
              << "</plist>";