pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix potential use of freed memory in the threaded timer system

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401024
This commit is contained in:
Sam Lantinga 2005-01-04 19:05:32 +00:00
parent bef6a4f3cc
commit 82fe1ff66f
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/timer/SDL_timer.c
View file

@ -45,7 +45,7 @@ int SDL_timer_running = 0;
Uint32 SDL_alarm_interval = 0; Uint32 SDL_alarm_interval = 0;
SDL_TimerCallback SDL_alarm_callback; SDL_TimerCallback SDL_alarm_callback;
static SDL_bool list_changed = SDL_FALSE; static volatile SDL_bool list_changed = SDL_FALSE;
/* Data used for a thread-based timer */ /* Data used for a thread-based timer */
static int SDL_timer_threaded = 0; static int SDL_timer_threaded = 0;
@ -114,6 +114,9 @@ void SDL_ThreadedTimerCheck(void)
Uint32 now, ms; Uint32 now, ms;
SDL_TimerID t, prev, next; SDL_TimerID t, prev, next;
int removed; int removed;
SDL_NewTimerCallback callback;
Uint32 interval;
void *param;
now = SDL_GetTicks(); now = SDL_GetTicks();
@ -133,8 +136,11 @@ void SDL_ThreadedTimerCheck(void)
printf("Executing timer %p (thread = %d)\n", printf("Executing timer %p (thread = %d)\n",
t, SDL_ThreadID()); t, SDL_ThreadID());
#endif #endif
callback = t->cb;
interval = t->interval;
param = t->param;
SDL_mutexV(SDL_timer_mutex); SDL_mutexV(SDL_timer_mutex);
ms = t->cb(t->interval, t->param); ms = callback(interval, param);
SDL_mutexP(SDL_timer_mutex); SDL_mutexP(SDL_timer_mutex);
if ( list_changed ) { if ( list_changed ) {
/* Abort, list of timers has been modified */ /* Abort, list of timers has been modified */