Don't call FreeInstance() if component == NULL (#626)

modelica · Nov 11, 2024 · 4c30c5b · 4c30c5b
1 parent a045e41
commit 4c30c5b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/fmusim/FMI1CSSimulation.c b/fmusim/FMI1CSSimulation.c
@@ -90,7 +90,7 @@ FMIStatus FMI1CSSimulate(const FMISimulationSettings* s) {
         }
     }
 
-    if (status != FMIFatal) {
+    if (status != FMIFatal && S->component) {
         FMI1FreeSlaveInstance(S);
     }
 

diff --git a/fmusim/FMI1MESimulation.c b/fmusim/FMI1MESimulation.c
@@ -182,7 +182,7 @@ FMIStatus FMI1MESimulate(const FMISimulationSettings* s) {
         }
     }
 
-    if (status != FMIFatal) {
+    if (status != FMIFatal && S->component) {
         FMI1FreeModelInstance(S);
     }
 

diff --git a/fmusim/FMI2CSSimulation.c b/fmusim/FMI2CSSimulation.c
@@ -135,7 +135,7 @@ FMIStatus FMI2CSSimulate(const FMISimulationSettings* s) {
         }
     }
 
-    if (status != FMIFatal) {
+    if (status != FMIFatal && S->component) {
         FMI2FreeInstance(S);
     }
 

diff --git a/fmusim/FMI2MESimulation.c b/fmusim/FMI2MESimulation.c
@@ -232,7 +232,7 @@ FMIStatus FMI2MESimulate(const FMISimulationSettings* s) {
         }
     }
 
-    if (status != FMIFatal) {
+    if (status != FMIFatal && S->component) {
         FMI2FreeInstance(S);
     }
 

diff --git a/fmusim/FMI3CSSimulation.c b/fmusim/FMI3CSSimulation.c
@@ -254,7 +254,7 @@ FMIStatus FMI3CSSimulate(const FMISimulationSettings* s) {
         }
     }
 
-    if (status != FMIFatal) {
+    if (status != FMIFatal && S->component) {
         FMI3FreeInstance(S);
     }
 

diff --git a/fmusim/FMI3MESimulation.c b/fmusim/FMI3MESimulation.c
@@ -246,7 +246,7 @@ FMIStatus FMI3MESimulate(const FMISimulationSettings* s) {
         }
     }
 
-    if (status != FMIFatal) {
+    if (status != FMIFatal && S->component) {
         FMI3FreeInstance(S);
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -90,7 +90,7 @@ FMIStatus FMI1CSSimulate(const FMISimulationSettings* s) { @@
             }
         }
-        if (status != FMIFatal) {
+        if (status != FMIFatal && S->component) {
             FMI1FreeSlaveInstance(S);
         }
@@ Expand Down @@