Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-10-02 05:06:46 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed buffer overflow in joystick cleanup. (valgrind ftw!)

Browse Source 
--HG--
branch : SDL-1.2
This commit is contained in:
Ryan C. Gordon
2011-11-03 12:42:23 -04:00
parent 393309d210
commit 8d0b0150b4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/joystick/SDL_joystick.c
View File

@@ -37,6 +37,7 @@
#endif
Uint8 SDL_numjoysticks = 0;
int SDL_allocatedjoysticks = 0;
SDL_Joystick **SDL_joysticks = NULL;
int SDL_JoystickInit(void)
@@ -47,10 +48,12 @@ int SDL_JoystickInit(void)
SDL_numjoysticks = 0;
status = SDL_SYS_JoystickInit();
if ( status >= 0 ) {
arraylen = (status+1)*sizeof(*SDL_joysticks);
SDL_allocatedjoysticks = status;
arraylen = (SDL_allocatedjoysticks+1)*sizeof(*SDL_joysticks);
SDL_joysticks = (SDL_Joystick **)SDL_malloc(arraylen);
if ( SDL_joysticks == NULL ) {
SDL_numjoysticks = 0;
SDL_allocatedjoysticks = 0;
} else {
SDL_memset(SDL_joysticks, 0, arraylen);
SDL_numjoysticks = status;
@@ -370,7 +373,7 @@ void SDL_JoystickClose(SDL_Joystick *joystick)
for ( i=0; SDL_joysticks[i]; ++i ) {
if ( joystick == SDL_joysticks[i] ) {
SDL_memmove(&SDL_joysticks[i], &SDL_joysticks[i+1],
(SDL_numjoysticks-i)*sizeof(joystick));
(SDL_allocatedjoysticks-i)*sizeof(joystick));
break;
}
}
@@ -419,6 +422,7 @@ void SDL_JoystickQuit(void)
if ( SDL_joysticks ) {
SDL_free(SDL_joysticks);
SDL_joysticks = NULL;
SDL_allocatedjoysticks = 0;
}
}