Fix potential read access to local stack memory after returning from …

…a function git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@17559 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 6, 2013 · f5f3408 · f5f3408
1 parent 7b27796
commit f5f3408
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/SimulationRuntime/c/meta/meta_modelica.h b/SimulationRuntime/c/meta/meta_modelica.h
@@ -649,8 +649,8 @@ extern void mmc_init();
 #define MMC_THROW() {longjmp(*((threadData_t*)pthread_getspecific(mmc_thread_data_key))->mmc_jumper,1);}
 #define MMC_ELSE() } else {
 
-#define MMC_TRY_TOP() { threadData_t threadDataOnStack = {0}, *threadData = &threadDataOnStack; pthread_setspecific(mmc_thread_data_key,threadData); MMC_TRY_INTERNAL(mmc_jumper)
-#define MMC_CATCH_TOP(X) threadData->mmc_jumper = old_jumper; } else {threadData->mmc_jumper = old_jumper;X;}}}
+#define MMC_TRY_TOP() { threadData_t threadDataOnStack = {0}, *oldThreadData = pthread_getspecific(mmc_thread_data_key), *threadData = &threadDataOnStack; pthread_setspecific(mmc_thread_data_key,threadData); MMC_TRY_INTERNAL(mmc_jumper)
+#define MMC_CATCH_TOP(X) pthread_setspecific(mmc_thread_data_key,oldThreadData); } else {pthread_setspecific(mmc_thread_data_key,oldThreadData);X;}}}
 
 #if defined(__cplusplus)
 }