Free allocated data

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@21073 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jun 12, 2014 · 21e64e6 · 21e64e6
1 parent 2396ae4
commit 21e64e6
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/SimulationRuntime/c/util/read_matlab4.c b/SimulationRuntime/c/util/read_matlab4.c
@@ -124,7 +124,8 @@ const char* omc_new_matlab4_reader(const char *filename, ModelicaMatReader *read
 {
   typedef const char *_string;
   const int nMatrix=6;
-  _string matrixNames[6]={"Aclass","name","description","dataInfo","data_1","data_2"};
+  static const char *matrixNames[6]={"Aclass","name","description","dataInfo","data_1","data_2"};
+  static const char *matrixNamesMismatch[6]={"Matrix name mismatch: Aclass","Matrix name mismatch: name","Matrix name mismatch: description","Matrix name mismatch: dataInfo","Matrix name mismatch: data_1","Matrix name mismatch: data_2"};
   const int matrixTypes[6]={51,51,51,20,0,0};
   int i;
   char binTrans = 1;
@@ -162,8 +163,12 @@ const char* omc_new_matlab4_reader(const char *filename, ModelicaMatReader *read
     }
     /* fprintf(stderr, "  Name of matrix: %s\n", name); */
     matrix_length = hdr.mrows*hdr.ncols*(1+hdr.imagf)*element_length;
-    if(0 != strcmp(name,matrixNames[i])) return "Matrix name mismatch";
-    free(name); name=NULL;
+    if(0 != strcmp(name,matrixNames[i])) {
+      free(name);
+      return matrixNamesMismatch[i];
+    }
+    free(name);
+    name=NULL;
     switch (i) {
     case 0: {
       unsigned int k;