- bug-fix: avoid infinite-loop in mapToDymolaVars

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@13139 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 2, 2012 · c6f6ab1 · c6f6ab1
1 parent 76a8dc2
commit c6f6ab1
Showing 1 changed file with 4 additions and 2 deletions.
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 */