Changeset 359fa1d in OpenModelica

Timestamp:

2021-05-18T11:46:02+02:00 (3 years ago)

Author:

AnHeuermann <andreas.heuermann@…>

Parents:

f1024952

git-author:

Andreas <38031952+AnHeuermann@…> (05/14/21 18:47:54)

git-committer:

AnHeuermann <andreas.heuermann@…> (05/18/21 11:46:02)

Message:

Fix memory leak of model info xml data

• Backporting #7471 and #7464

Location:

OMCompiler/SimulationRuntime/c/simulation

Files:

• simulation_info_json.c (modified) (2 diffs)
• simulation_info_json.h (modified) (1 diff)
• solver/model_help.c (modified) (1 diff)

OMCompiler/SimulationRuntime/c/simulation/simulation_info_json.c

@@ -394 +394 @@
   }
 #endif
+  assert(xml->functionNames == NULL);
   xml->functionNames = (FUNCTION_INFO*) calloc(xml->nFunctions, sizeof(FUNCTION_INFO));
+  assert(xml->equationInfo == NULL);
   xml->equationInfo = (EQUATION_INFO*) calloc(1+xml->nEquations, sizeof(EQUATION_INFO));
   xml->equationInfo[0].id = 0;
@@ -411 +413 @@
 }
 
+/**
+ * @brief Deinitialize memory allocated by modelInfoInit
+ *
+ * @param xml   Pointer to model info xml data.
+ */
+void modelInfoDeinit(MODEL_DATA_XML* xml)
+{
+  free(xml->functionNames); xml->functionNames = NULL;
+  free(xml->equationInfo); xml->equationInfo = NULL;
+}
+
 FUNCTION_INFO modelInfoGetFunction(MODEL_DATA_XML* xml, size_t ix)
 {

OMCompiler/SimulationRuntime/c/simulation/simulation_info_json.h

@@ -38 +38 @@
 #endif
 
-extern FUNCTION_INFO modelInfoGetFunction(MODEL_DATA_XML*,size_t);
-extern void modelInfoInit(MODEL_DATA_XML*);
-extern EQUATION_INFO modelInfoGetEquation(MODEL_DATA_XML*,size_t);
-extern EQUATION_INFO modelInfoGetEquationIndexByProfileBlock(MODEL_DATA_XML*,size_t);
+void modelInfoInit(MODEL_DATA_XML* xml);
+void modelInfoDeinit(MODEL_DATA_XML* xml);
+FUNCTION_INFO modelInfoGetFunction(MODEL_DATA_XML* xml, size_t ix);
+EQUATION_INFO modelInfoGetEquation(MODEL_DATA_XML* xml, size_t ix);
+EQUATION_INFO modelInfoGetEquationIndexByProfileBlock(MODEL_DATA_XML* xml, size_t ix);
 
 #ifdef __cplusplus

OMCompiler/SimulationRuntime/c/simulation/solver/model_help.c

@@ -1274 +1274 @@
   }
 
+  /* Free model info xml data */
+  modelInfoDeinit(&(data->modelData->modelDataXml));
+
   TRACE_POP
 }