Fix memory issues in OMSString.cpp (triggered by Snapshot.cpp) (#1356)

Author: lochel

src/OMSimulatorLib/Model.cpp

@@ -62,6 +62,9 @@ oms::Model::~Model()
   if (system)
     delete system;
 
+  for (auto const & variant : ssdVariants)
+    free(variant.second);
+
   // delete temp directory
   if (Flags::DeleteTempFiles())
   {
@@ -200,6 +203,13 @@ oms_status_enu_t oms::Model::duplicateVariant(const ComRef& crefA, const ComRef&
   Snapshot snapshot;
   snapshot.import(fullsnapshot);
 
+  {
+    auto it = ssdVariants.find(snapshot.getRootCref());
+    if (it != ssdVariants.end())
+    {
+      free(ssdVariants[snapshot.getRootCref()]);
+    }
+  }
   ssdVariants[snapshot.getRootCref()] = fullsnapshot;
 
   // rename the model and all it components to new variant name
@@ -254,6 +264,7 @@ oms_status_enu_t oms::Model::activateVariant(const ComRef& crefA, const ComRef&
       variants.writeDocument(&modifiedVariant);
       char * newCref = NULL;
       importSnapshot(modifiedVariant, &newCref);
+      free(modifiedVariant);
       return oms_status_ok;
     }
   }
@@ -271,6 +282,7 @@ oms_status_enu_t oms::Model::listVariants(const oms::ComRef& cref, char** conten
   exportSnapshot("", &fullsnapshot);
   Snapshot currentSnapshot;
   currentSnapshot.import(fullsnapshot);
+  free(fullsnapshot);
 
   pugi::xml_node oms_Variants = allVariantSnapshot.getTemplateResourceNodeSSDVariants();
 

src/OMSimulatorLib/Scope.cpp

@@ -244,6 +244,13 @@ oms_status_enu_t oms::Scope::importModel(const std::string& filename, char** _cr
           variants.importResourceFile(naive_uncomplete(entry.path(), model->getTempDirectory()), model->getTempDirectory());
           char* variantSnapshot = NULL;
           variants.writeDocument(&variantSnapshot);
+          {
+            auto it = model->ssdVariants.find(variants.getRootCref());
+            if (it != model->ssdVariants.end())
+            {
+              free(model->ssdVariants[variants.getRootCref()]);
+            }
+          }
           model->ssdVariants[variants.getRootCref()] = variantSnapshot;
         }
       }

testsuite/simulation/activateVariant1.lua

@@ -4,6 +4,7 @@
 -- ucrt64: yes
 -- win: no
 -- mac: no
+-- asan: yes
 
 oms_setCommandLineOption("--suppressPath=true")
 oms_setTempDirectory("./activatevariant_01_lua/")