# HG changeset patch
# User Ryan C. Gordon <icculus@icculus.org>
# Date 1262762809 0
# Node ID 3c1b39d0d1a61c07e2e4f1c41199b98e80afa1bc
# Parent  72a1c4dda07cd0ebc8b7fc617cfdc1e642d248b0
Merged r4121:4122 from branches/SDL-1.2: win32 joystick double-free fix.

diff -r 72a1c4dda07c -r 3c1b39d0d1a6 src/joystick/win32/SDL_mmjoystick.c
--- a/src/joystick/win32/SDL_mmjoystick.c	Wed Jan 06 06:44:23 2010 +0000
+++ b/src/joystick/win32/SDL_mmjoystick.c	Wed Jan 06 07:26:49 2010 +0000
@@ -362,6 +362,7 @@
     if (joystick->hwdata != NULL) {
         /* free system specific hardware data */
         SDL_free(joystick->hwdata);
+        joystick->hwdata = NULL;
     }
 }
 
@@ -373,6 +374,7 @@
     for (i = 0; i < MAX_JOYSTICKS; i++) {
         if (SYS_JoystickName[i] != NULL) {
             SDL_free(SYS_JoystickName[i]);
+            SYS_JoystickName[i] = NULL;
         }
     }
 }