- allocate the structure, not the pointer

adrpo · adrpo · commit b369c6dd4613 · 2015-03-24T17:19:56.000Z
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25238 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
diff --git a/SimulationRuntime/c/simulation/solver/dassl.c b/SimulationRuntime/c/simulation/solver/dassl.c
@@ -228,7 +228,8 @@ int dassl_initial(DATA* data, SOLVER_INFO* solverInfo, DASSL_DATA *dasslData)
     assertStreamPrint(data->threadData, 0 != tmpSimData.stringVars, "out of memory");
     appendRingData(dasslData->simulationData, &tmpSimData);
   }
-  dasslData->localData = (SIMULATION_DATA**) GC_malloc_uncollectable(SIZERINGBUFFER * sizeof(SIMULATION_DATA*));
+  dasslData->localData = (SIMULATION_DATA**) GC_malloc_uncollectable(SIZERINGBUFFER * sizeof(SIMULATION_DATA));
+  memset(dasslData->localData, 0, SIZERINGBUFFER * sizeof(SIMULATION_DATA));
   rotateRingBuffer(dasslData->simulationData, 0, (void**) dasslData->localData);
 
   /* end setup internal ring buffer for dassl */
diff --git a/SimulationRuntime/c/simulation/solver/model_help.c b/SimulationRuntime/c/simulation/solver/model_help.c
@@ -873,7 +873,8 @@ void initializeDataStruc(DATA *data)
     assertStreamPrint(data->threadData, 0 != tmpSimData.stringVars, "out of memory");
     appendRingData(data->simulationData, &tmpSimData);
   }
-  data->localData = (SIMULATION_DATA**) GC_malloc_uncollectable(SIZERINGBUFFER * sizeof(SIMULATION_DATA*));
+  data->localData = (SIMULATION_DATA**) GC_malloc_uncollectable(SIZERINGBUFFER * sizeof(SIMULATION_DATA));
+  memset(data->localData, 0, SIZERINGBUFFER * sizeof(SIMULATION_DATA));
   rotateRingBuffer(data->simulationData, 0, (void**) data->localData);
 
   /* create modelData var arrays */

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,8 @@ int dassl_initial(DATA* data, SOLVER_INFO* solverInfo, DASSL_DATA *dasslData)`
`228`	`228`	`assertStreamPrint(data->threadData, 0 != tmpSimData.stringVars, "out of memory");`
`229`	`229`	`appendRingData(dasslData->simulationData, &tmpSimData);`
`230`	`230`	`}`
`231`		`- dasslData->localData = (SIMULATION_DATA*) GC_malloc_uncollectable(SIZERINGBUFFER sizeof(SIMULATION_DATA*));`
	`231`	`+ dasslData->localData = (SIMULATION_DATA*) GC_malloc_uncollectable(SIZERINGBUFFER sizeof(SIMULATION_DATA));`
	`232`	`+ memset(dasslData->localData, 0, SIZERINGBUFFER * sizeof(SIMULATION_DATA));`
`232`	`233`	`rotateRingBuffer(dasslData->simulationData, 0, (void**) dasslData->localData);`
`233`	`234`
`234`	`235`	`/* end setup internal ring buffer for dassl */`
Original file line number	Diff line number	Diff line change
`@@ -873,7 +873,8 @@ void initializeDataStruc(DATA *data)`
`873`	`873`	`assertStreamPrint(data->threadData, 0 != tmpSimData.stringVars, "out of memory");`
`874`	`874`	`appendRingData(data->simulationData, &tmpSimData);`
`875`	`875`	`}`
`876`		`- data->localData = (SIMULATION_DATA*) GC_malloc_uncollectable(SIZERINGBUFFER sizeof(SIMULATION_DATA*));`
	`876`	`+ data->localData = (SIMULATION_DATA*) GC_malloc_uncollectable(SIZERINGBUFFER sizeof(SIMULATION_DATA));`
	`877`	`+ memset(data->localData, 0, SIZERINGBUFFER * sizeof(SIMULATION_DATA));`
`877`	`878`	`rotateRingBuffer(data->simulationData, 0, (void**) data->localData);`
`878`	`879`
`879`	`880`	`/* create modelData var arrays */`