Fix #335: object lifetime issue when reporting error (#336)

danmar · Feb 2, 2024 · 1b29369 · 1b29369
1 parent ea78f9a
commit 1b29369
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/simplecpp.cpp b/simplecpp.cpp
@@ -380,14 +380,14 @@ class StdIStream : public simplecpp::TokenList::Stream {
 class FileStream : public simplecpp::TokenList::Stream {
 public:
     // cppcheck-suppress uninitDerivedMemberVar - we call Stream::init() to initialize the private members
-    EXPLICIT FileStream(const std::string &filename)
+    EXPLICIT FileStream(const std::string &filename, std::vector<std::string> &files)
         : file(fopen(filename.c_str(), "rb"))
         , lastCh(0)
         , lastStatus(0)
     {
         if (!file) {
-            const std::vector<std::string> location;
-            throw simplecpp::Output(location, simplecpp::Output::FILE_NOT_FOUND, "File is missing: " + filename);
+            files.push_back(filename);
+            throw simplecpp::Output(files, simplecpp::Output::FILE_NOT_FOUND, "File is missing: " + filename);
         }
         init();
     }
@@ -447,7 +447,7 @@ simplecpp::TokenList::TokenList(const std::string &filename, std::vector<std::st
 {
     try
     {
-        FileStream stream(filename);
+        FileStream stream(filename, filenames);
         readfile(stream,filename,outputList);
     }
     catch(const simplecpp::Output & e) // TODO handle extra type of errors

diff --git a/simplecpp.h b/simplecpp.h
@@ -183,7 +183,7 @@ namespace simplecpp {
             EXPLICIT_INCLUDE_NOT_FOUND,
             FILE_NOT_FOUND
         } type;
-        explicit Output(const std::vector<std::string> &files, Output::Type id, const std::string & errMsg ) : type(id), location(files), msg(errMsg) {}
+        explicit Output(const std::vector<std::string>& files, Type type, const std::string& msg) : type(type), location(files), msg(msg) {}
         Location location;
         std::string msg;
     };