- bug-fix: avoid infinite-loop in mapToDymolaVars

lochel · lochel · commit c6f6ab17932d · 2012-10-02T09:41:13.000Z
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@13139 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
diff --git a/SimulationRuntime/c/simulation/solver/initialization.c b/SimulationRuntime/c/simulation/solver/initialization.c
@@ -533,6 +533,9 @@ char* mapToDymolaVars(const char* varname)
       if(newVarname[pos] == '.')
         break;
 
+    if(pos == 3)
+      break;
+
     memcpy((void*)newVarname, (const void*)(newVarname+4), (pos-3)*sizeof(char));
     memcpy((void*)(newVarname+pos-3), (const void*)"der(", 4*sizeof(char));
   }
@@ -675,8 +678,7 @@ static int importStartValues(DATA *data, const char* pInitFile, double initTime)
  *
  *  \author lochel
  */
-int initialization(DATA *data, const char* pInitMethod, const char* pOptiMethod,
-    const char* pInitFile, double initTime)
+int initialization(DATA *data, const char* pInitMethod, const char* pOptiMethod, const char* pInitFile, double initTime)
 {
   int initMethod = IIM_STATE;               /* default method */
   int optiMethod = IOM_NELDER_MEAD_EX;      /* default method */

Original file line number	Diff line number	Diff line change
`@@ -533,6 +533,9 @@ char* mapToDymolaVars(const char* varname)`
`533`	`533`	`if(newVarname[pos] == '.')`
`534`	`534`	`break;`
`535`	`535`
	`536`	`+ if(pos == 3)`
	`537`	`+ break;`
	`538`	`+`
`536`	`539`	`memcpy((void)newVarname, (const void)(newVarname+4), (pos-3)*sizeof(char));`
`537`	`540`	`memcpy((void)(newVarname+pos-3), (const void)"der(", 4*sizeof(char));`
`538`	`541`	`}`
`@@ -675,8 +678,7 @@ static int importStartValues(DATA data, const char pInitFile, double initTime)`
`675`	`678`	`*`
`676`	`679`	`* \author lochel`
`677`	`680`	`*/`
`678`		`-int initialization(DATA data, const char pInitMethod, const char* pOptiMethod,`
`679`		`- const char* pInitFile, double initTime)`
	`681`	`+int initialization(DATA data, const char pInitMethod, const char* pOptiMethod, const char* pInitFile, double initTime)`
`680`	`682`	`{`
`681`	`683`	`int initMethod = IIM_STATE; /* default method */`
`682`	`684`	`int optiMethod = IOM_NELDER_MEAD_EX; /* default method */`