Fix memory corruption (marker was getting overflowed because

some strings are 8 characters.  With the null chararacter, it
needed to be 9 chars.  It was only 8.  Also, fixed the non rw option.

Author: jmailloux

src/app.cpp

@@ -35,6 +35,7 @@ void CoderApp::GenerateCode()
   CiMainGenerator cigen;
   CiUtilGenerator ciugen;
   FsCreator fscreator;
+  std::string path;
 
   std::ifstream reader;
 
@@ -57,9 +58,18 @@ void CoderApp::GenerateCode()
   std::string info("");
 
   // create main destination directory
-  fscreator.Configure(Params.drvname.first, Params.outdir.first, info, scanner.dblist.ver.hi, scanner.dblist.ver.low);
+  if (!Params.is_rewrite)
+  {
+    path = fscreator.FindPath(Params.outdir.first);
+  }
+  else
+  {
+    path = Params.outdir.first;
+  }
+
+  fscreator.Configure(Params.drvname.first, path, info, scanner.dblist.ver.hi, scanner.dblist.ver.low);
 
-  auto ret = fscreator.PrepareDirectory(Params.is_rewrite);
+  auto ret = fscreator.PrepareDirectory();
 
   fscreator.FS.gen.no_config = Params.is_noconfig;
   fscreator.FS.gen.no_inc = Params.is_nocanmon;

src/codegen/fs-creator.cpp

@@ -1,4 +1,5 @@
 #include <sys/stat.h>
+#include <iostream>
 #include <filesystem>
 #include "fs-creator.h"
 #include "helpers/formatter.h"
@@ -17,6 +18,23 @@ FsCreator::FsCreator()
 {
 }
 
+std::string FsCreator::FindPath(const std::string& outpath)
+{
+  std::string work_dir_path;
+  std::string separator = work_dir_path.back() == '/' ? "" : "/";
+
+  for (uint32_t dirnum = 0; dirnum < 1000; dirnum++)
+  {
+    snprintf(_tmpb, kTmpLen, "%03d", dirnum);
+    work_dir_path = outpath + separator + _tmpb;
+
+    if (!std::filesystem::exists(work_dir_path))
+    {
+      break;
+    }
+  }
+  return work_dir_path;
+}
 
 void FsCreator::Configure(const std::string& drvname, const std::string& outpath,
   const std::string& info, uint32_t h, uint32_t l)
@@ -94,61 +112,18 @@ void FsCreator::Configure(const std::string& drvname, const std::string& outpath
   FS.gen.lowver = l;
 }
 
-bool FsCreator::PrepareDirectory(bool rw)
+bool FsCreator::PrepareDirectory()
 {
   bool ret = false;
-
-  // find free directory
-  struct stat info;
-
-  std::string work_dir_path;
+  std::error_code ec;
   const auto& basepath = FS.file.core_h.dir;
 
-  if (rw)
-  {
-    work_dir_path = basepath;
-    ret = true;
-
-    // for this case check only if directory exists
-    if (stat(work_dir_path.c_str(), &info) != 0)
-    {
-      if (!std::filesystem::create_directory(work_dir_path))
-      {
-        ret = false;
-      }
-    }
-  }
-  else
+  std::filesystem::create_directories(basepath, ec);
+  if (ec)
   {
-    std::string separator = basepath.back() == '/' ? "" : "/";
-
-    for (int32_t dirnum = 0; dirnum < 1000; dirnum++)
-    {
-      snprintf(_tmpb, kTmpLen, "%03d", dirnum);
-      work_dir_path = basepath + separator + _tmpb;
-
-      if (stat(work_dir_path.c_str(), &info) != 0)
-      {
-        if (std::filesystem::create_directory(work_dir_path))
-        {
-          ret = true;
-          break;
-        }
-      }
-      else if (info.st_mode & S_IFDIR)
-      {
-        // directory exists, try next num
-        continue;
-      }
-      else
-      {
-        if (std::filesystem::create_directory(work_dir_path) != 0)
-        {
-          ret = false;
-          break;
-        }
-      }
-    }
+      // If there is an error, ec will evaluate to true
+      std::cerr << "Error creating directories: " << ec.message() << std::endl;
+      return false;
   }
 
   std::filesystem::create_directory(FS.file.libdir);
@@ -157,7 +132,7 @@ bool FsCreator::PrepareDirectory(bool rw)
   std::filesystem::create_directory(FS.file.confdir);
   std::filesystem::create_directory(FS.file.utildir);
 
-  return ret;
+  return true;
 }
 
 std::string FsCreator::CreateSubDir(std::string basepath, std::string sub, bool rw)

src/codegen/fs-creator.h

@@ -68,13 +68,12 @@ typedef struct
 class FsCreator {
  public:
   FsCreator();
-
+  std::string FindPath(const std::string& outpath);
   void Configure(const std::string& drvname, const std::string& outpath, const std::string& info, uint32_t h, uint32_t l);
-  bool PrepareDirectory(bool rw);
+  bool PrepareDirectory();
 
   std::string CreateSubDir(std::string basepath, std::string subdir, bool rm = true);
 
   AppSettings_t FS;
 
 };
-

src/parser/dbcscanner.cpp

@@ -1,5 +1,6 @@
 #include "dbcscanner.h"
 #include <cstring>
+#include <sstream>
 #include <algorithm>
 #include <math.h>
 #include "../helpers/formatter.h"
@@ -341,23 +342,15 @@ void DbcScanner::SetDefualtMessage(MessageDescriptor_t* message)
 void DbcScanner::FindVersion(const std::string& instr)
 {
   // try to find version string which looks like: VERSION "x.x"
-  static constexpr char* versionAttr = (char*)"VERSION";
-  static constexpr size_t VER_MIN_LENGTH = strlen(versionAttr);
-
+  std::istringstream iss(instr);
+  std::string marker;
+  char token;
   uint32_t h = 0, l = 0;
-  char marker[VER_MIN_LENGTH + 1u];
-
-  if (instr.size() < VER_MIN_LENGTH)
-  {
-    return;
-  }
 
-  auto ret = std::sscanf(instr.c_str(), "%8s \"%u.%u\"", marker, &h, &l);
-
-  if ((ret == 3) && (std::strcmp(marker, versionAttr) == 0))
-  {
-    // versions have been found, save numeric values
-    dblist.ver.hi = h;
-    dblist.ver.low = l;
+  if (iss >> marker >> token && token == '"' && marker == "VERSION") {
+    if (iss >> h >> token && token == '.' && iss >> l) {
+      dblist.ver.hi = h;
+      dblist.ver.low = l;
+    }
   }
 }