From 67bd8e2549fbe93fabefe0137e44dba821c921c2 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Wed, 6 Jan 2010 07:26:49 +0000 Subject: [PATCH] Merged r4121:4122 from branches/SDL-1.2: win32 joystick double-free fix. --- src/joystick/win32/SDL_mmjoystick.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/joystick/win32/SDL_mmjoystick.c b/src/joystick/win32/SDL_mmjoystick.c index 468f5d393..779b0dc74 100644 --- a/src/joystick/win32/SDL_mmjoystick.c +++ b/src/joystick/win32/SDL_mmjoystick.c @@ -362,6 +362,7 @@ SDL_SYS_JoystickClose(SDL_Joystick * joystick) if (joystick->hwdata != NULL) { /* free system specific hardware data */ SDL_free(joystick->hwdata); + joystick->hwdata = NULL; } } @@ -373,6 +374,7 @@ SDL_SYS_JoystickQuit(void) for (i = 0; i < MAX_JOYSTICKS; i++) { if (SYS_JoystickName[i] != NULL) { SDL_free(SYS_JoystickName[i]); + SYS_JoystickName[i] = NULL; } } }