fix memory leaks in parseModelStructureElement()

Author: arun3688

fmi4c/src/fmi4c.c

@@ -1789,7 +1789,7 @@ bool parseModelDescriptionFmi3(fmiHandle *fmu)
         int i=0;
         outputElement = ezxml_child(modelStructureElement, "Output");
         for(;outputElement;outputElement = outputElement->next) {
-            if(!parseModelStructureElement(&fmu->fmi3.outputs[i], &outputElement)) {
+            if(!parseModelStructureElement(&fmu->fmi3.outputs[i], &outputElement, fmu)) {
                 return false;
             }
             ++i;
@@ -1799,7 +1799,7 @@ bool parseModelDescriptionFmi3(fmiHandle *fmu)
         i=0;
         continuousStateDerElement = ezxml_child(modelStructureElement, "ContinuousStateDerivative");
         for(;continuousStateDerElement;continuousStateDerElement = continuousStateDerElement->next) {
-            if(!parseModelStructureElement(&fmu->fmi3.continuousStateDerivatives[i], &continuousStateDerElement)) {
+            if(!parseModelStructureElement(&fmu->fmi3.continuousStateDerivatives[i], &continuousStateDerElement, fmu)) {
                 return false;
             }
             ++i;
@@ -1809,7 +1809,7 @@ bool parseModelDescriptionFmi3(fmiHandle *fmu)
         i=0;
         clockedStateElement = ezxml_child(modelStructureElement, "ClockedState");
         for(;clockedStateElement;clockedStateElement = clockedStateElement->next) {
-            if(!parseModelStructureElement(&fmu->fmi3.clockedStates[i], &clockedStateElement)) {
+            if(!parseModelStructureElement(&fmu->fmi3.clockedStates[i], &clockedStateElement, fmu)) {
                 return false;
             }
             ++i;
@@ -1819,7 +1819,7 @@ bool parseModelDescriptionFmi3(fmiHandle *fmu)
         i=0;
         initialUnknownElement = ezxml_child(modelStructureElement, "IninitalUnknown");
         for(;initialUnknownElement;initialUnknownElement = initialUnknownElement->next) {
-            if(!parseModelStructureElement(&fmu->fmi3.initialUnknowns[i], &initialUnknownElement)) {
+            if(!parseModelStructureElement(&fmu->fmi3.initialUnknowns[i], &initialUnknownElement, fmu)) {
                 return false;
             }
             ++i;
@@ -1829,7 +1829,7 @@ bool parseModelDescriptionFmi3(fmiHandle *fmu)
         i=0;
         eventIndicatorElement = ezxml_child(modelStructureElement, "EventIndicator");
         for(;eventIndicatorElement;eventIndicatorElement = eventIndicatorElement->next) {
-            if(!parseModelStructureElement(&fmu->fmi3.eventIndicators[i], &eventIndicatorElement)) {
+            if(!parseModelStructureElement(&fmu->fmi3.eventIndicators[i], &eventIndicatorElement, fmu)) {
                 return false;
             }
             ++i;

fmi4c/src/fmi4c_utils.c

@@ -249,21 +249,20 @@ bool parseUInt8AttributeEzXml(ezxml_t element, const char *attributeName, uint8_
     return false;
 }
 
-bool parseModelStructureElement(fmi3ModelStructureElement *output, ezxml_t *element)
+bool parseModelStructureElement(fmi3ModelStructureElement *output, ezxml_t *element, fmiHandle *fmu)
 {
     //Count number of dependencies
     output->numberOfDependencies = 0;
     const char* dependencies = NULL;
-    if(parseStringAttributeEzXml(*element, "dependencies", &dependencies)) {
+    if(parseStringAttributeEzXmlAndRememberPointer(*element, "dependencies", &dependencies, fmu)) {
 
         if(dependencies == NULL || dependencies[0] == '\0') {
             //If dependencies is empty, no need to parse further
             return true;
         }
 
         //Duplicate the dependencies string to make it mutable
-        char* nonConstDependencies = _strdup(dependencies);
-        free((char*)dependencies);
+        char* nonConstDependencies = duplicateAndRememberString(fmu, dependencies);
 
         if (nonConstDependencies == NULL) {
             return false; //strdup failed, handle as an error
@@ -279,7 +278,7 @@ bool parseModelStructureElement(fmi3ModelStructureElement *output, ezxml_t *elem
 
 
         //Allocate memory for dependencies
-        output->dependencies = malloc(output->numberOfDependencies*sizeof(fmi3ValueReference));
+        output->dependencies = mallocAndRememberPointer(fmu, output->numberOfDependencies*sizeof(fmi3ValueReference));
 
         //Read dependencies
         const char* delim = " ";
@@ -294,14 +293,12 @@ bool parseModelStructureElement(fmi3ModelStructureElement *output, ezxml_t *elem
 
         //Parse depenendency kinds element if present
         const char* dependencyKinds = NULL;
-        parseStringAttributeEzXml(*element, "dependencyKinds", &dependencyKinds);
+        parseStringAttributeEzXmlAndRememberPointer(*element, "dependencyKinds", &dependencyKinds, fmu);
         if(dependencyKinds) {
-            char* nonConstDependencyKinds = _strdup(dependencyKinds);
-            free((char*)dependencyKinds);
+            char* nonConstDependencyKinds = duplicateAndRememberString(fmu, dependencyKinds);
 
             //Allocate memory for dependencies (assume same number as dependencies, according to FMI3 specification)
-            output->dependencies = malloc(output->numberOfDependencies*sizeof(fmi3ValueReference));
-
+            output->dependencies = mallocAndRememberPointer(fmu, output->numberOfDependencies*sizeof(fmi3ValueReference));
             //Read dependency kinds
             for(int j=0; j<output->numberOfDependencies; ++j) {
                 const char* kind;
@@ -313,9 +310,7 @@ bool parseModelStructureElement(fmi3ModelStructureElement *output, ezxml_t *elem
                 }
 
                 if(!strcmp(kind, "independent")) {
-                    fmi4cErrorMessage = _strdup("Dependency kind = \"independent\" is not allowed for output dependencies.");
-                    free(nonConstDependencyKinds);
-                    free(nonConstDependencies);
+                    fmi4cErrorMessage = duplicateAndRememberString(fmu, "Dependency kind = \"independent\" is not allowed for output dependencies.");
                     return false;
                 }
                 else if(!strcmp(kind, "constant")) {
@@ -334,15 +329,11 @@ bool parseModelStructureElement(fmi3ModelStructureElement *output, ezxml_t *elem
                     output->dependencyKinds[j] = fmi3Dependent;
                 }
                 else {
-                    fmi4cErrorMessage = _strdup("Unknown dependency kind for output dependency.");
-                    free(nonConstDependencyKinds);
-                    free(nonConstDependencies);
+                    fmi4cErrorMessage = duplicateAndRememberString(fmu, "Unknown dependency kind for output dependency.");
                     return false;
                 }
             }
-            free(nonConstDependencyKinds);
         }
-        free(nonConstDependencies);
     }
 
     return true;

fmi4c/src/fmi4c_utils.h

@@ -29,6 +29,6 @@ bool parseUInt32AttributeEzXml(ezxml_t element, const char* attributeName, uint3
 bool parseUInt16AttributeEzXml(ezxml_t element, const char *attributeName, uint16_t* target);
 bool parseUInt8AttributeEzXml(ezxml_t element, const char *attributeName, uint8_t *target);
 
-bool parseModelStructureElement(fmi3ModelStructureElement *output, ezxml_t *element);
+bool parseModelStructureElement(fmi3ModelStructureElement *output, ezxml_t *element, fmiHandle *fmu);
 
 #endif // FMIC_UTILS_H