Mercurial > sdl-ios-xcode
comparison src/joystick/win32/SDL_mmjoystick.c @ 4158:96ce26f24b01 SDL-1.2
Date: Sun, 7 Sep 2008 15:17:00 +0200
From: c2woody@gmx.net
Subject: [SDL] SDL 1.2 doube free/pointer zeroing missing
Hello,
this is about a crash/debug breakage for the current SDL 1.2
source tree (today's svn checkout, same problem in 1.2.13 and
before as far as relevant).
In some places memory is free()d but the associated pointer
is not zeroed, leading to for example double free()s.
For me this happened because SDL_StopEventThread() was executed
twice (during restart of the subsystems), once for the close
down in SDL_VideoQuit() and once at the startup, right at the
beginning of SDL_StartEventLoop(). Thus the code
SDL_DestroyMutex(SDL_EventQ.lock);
(see SDL_events.c) was called twice and executed the SDL_free(mutex);
twice as well, leading to a crash (msvc 64bit for which it was noticed).
I've tried to check all other occurrences of SDL_free and similar
code in msvc, see the attached patch (udiff against revision 4082).
Non-windows only codepaths have neither been checked nor touched.
Comments/ideas welcome.
Attached patch: NULLifies some pointers after they have been free()d.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Wed, 12 Nov 2008 17:23:40 +0000 |
parents | 209a3ef8a328 |
children | a1b03ba2fcd0 |
comparison
equal
deleted
inserted
replaced
4157:baf615f9f2a0 | 4158:96ce26f24b01 |
---|---|
342 void SDL_SYS_JoystickClose(SDL_Joystick *joystick) | 342 void SDL_SYS_JoystickClose(SDL_Joystick *joystick) |
343 { | 343 { |
344 if (joystick->hwdata != NULL) { | 344 if (joystick->hwdata != NULL) { |
345 /* free system specific hardware data */ | 345 /* free system specific hardware data */ |
346 SDL_free(joystick->hwdata); | 346 SDL_free(joystick->hwdata); |
347 joystick->hwdata = NULL; | |
347 } | 348 } |
348 } | 349 } |
349 | 350 |
350 /* Function to perform any system-specific joystick related cleanup */ | 351 /* Function to perform any system-specific joystick related cleanup */ |
351 void SDL_SYS_JoystickQuit(void) | 352 void SDL_SYS_JoystickQuit(void) |
352 { | 353 { |
353 int i; | 354 int i; |
354 for (i = 0; i < MAX_JOYSTICKS; i++) { | 355 for (i = 0; i < MAX_JOYSTICKS; i++) { |
355 if ( SYS_JoystickName[i] != NULL ) { | 356 if ( SYS_JoystickName[i] != NULL ) { |
356 SDL_free(SYS_JoystickName[i]); | 357 SDL_free(SYS_JoystickName[i]); |
358 SYS_JoystickName[i] = NULL; | |
357 } | 359 } |
358 } | 360 } |
359 } | 361 } |
360 | 362 |
361 | 363 |