Skip to content

Commit

Permalink
- Fix read_matlab4.c
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@9104 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed May 25, 2011
1 parent d6b5e90 commit 2d3378a
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions c_runtime/read_matlab4.c
Expand Up @@ -43,8 +43,10 @@ void omc_free_matlab4_reader(ModelicaMatReader *reader)
unsigned int i;
fclose(reader->file);
free(reader->fileName); reader->fileName=NULL;
for (i=0; i<reader->nall; i++)
for (i=0; i<reader->nall; i++) {
free(reader->allInfo[i].name);
free(reader->allInfo[i].descr);
}
free(reader->allInfo); reader->allInfo=NULL;
free(reader->params); reader->params=NULL;
for (i=0; i<reader->nvar*2; i++)
Expand Down Expand Up @@ -101,7 +103,7 @@ const char* omc_new_matlab4_reader(const char *filename, ModelicaMatReader *read
}
case 1: { /* "names" */
unsigned int i;
if (binTrans==0)
if (binTrans==0)
reader->nall = hdr.mrows;
else
reader->nall = hdr.ncols;
Expand Down Expand Up @@ -138,10 +140,11 @@ const char* omc_new_matlab4_reader(const char *filename, ModelicaMatReader *read
break;
}
case 2: { /* description */
unsigned int i;
if (binTrans==1) {
for (i=0; i<hdr.ncols; i++) {
reader->allInfo[i].name = (char*) malloc(hdr.mrows+1);
if (fread(reader->allInfo[i].name,hdr.mrows,1,reader->file) != 1) return "Corrupt header: names matrix";
reader->allInfo[i].descr = (char*) malloc(hdr.mrows+1);
if (fread(reader->allInfo[i].descr,hdr.mrows,1,reader->file) != 1) return "Corrupt header: names matrix";
reader->allInfo[i].descr[hdr.mrows] = '\0';
}
} else if (binTrans==0) {
Expand Down

0 comments on commit 2d3378a

Please sign in to comment.