Mirrors_Framework/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-05-27 02:46:08 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixed potential uninitialized memory access (thanks Mathieu!)

Browse Source 
GetRawInputDeviceList() can return a different number of devices than was allocated.

Fixes https://github.com/libsdl-org/SDL/issues/2759

(cherry picked from commit b9784feb24)
(cherry picked from commit aa129c9257)
This commit is contained in:
Sam Lantinga
2023-11-04 21:10:10 -07:00
parent 221d6ea8a8
commit ac23faf0a6
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/joystick/windows/SDL_rawinputjoystick.c
+2 -1
View File
@@ -988,7 +988,8 @@ static void RAWINPUT_DetectDevices(void)
devices = (PRAWINPUTDEVICELIST)SDL_malloc(sizeof(RAWINPUTDEVICELIST) * device_count); devices = (PRAWINPUTDEVICELIST)SDL_malloc(sizeof(RAWINPUTDEVICELIST) * device_count);
if (devices) { if (devices) {
if (GetRawInputDeviceList(devices, &device_count, sizeof(RAWINPUTDEVICELIST)) != -1) { device_count = GetRawInputDeviceList(devices, &device_count, sizeof(RAWINPUTDEVICELIST));
if (device_count != (UINT)-1) {
for (i = 0; i < device_count; ++i) { for (i = 0; i < device_count; ++i) {
RAWINPUT_AddDevice(devices[i].hDevice); RAWINPUT_AddDevice(devices[i].hDevice);
} }
src/joystick/windows/SDL_windows_gaming_input.c
+2 -1
View File
@@ -136,7 +136,8 @@ static SDL_bool SDL_IsXInputDevice(Uint16 vendor, Uint16 product)
return SDL_FALSE; return SDL_FALSE;
} }
if (GetRawInputDeviceList(raw_devices, &raw_device_count, sizeof(RAWINPUTDEVICELIST)) == -1) { raw_device_count = GetRawInputDeviceList(raw_devices, &raw_device_count, sizeof(RAWINPUTDEVICELIST));
if (raw_device_count == (UINT)-1) {
SDL_free(raw_devices); SDL_free(raw_devices);
raw_devices = NULL; raw_devices = NULL;
return SDL_FALSE; /* oh well. */ return SDL_FALSE; /* oh well. */
src/joystick/windows/SDL_xinputjoystick.c
+2 -1
View File
@@ -134,7 +134,8 @@ static void GuessXInputDevice(Uint8 userid, Uint16 *pVID, Uint16 *pPID, Uint16 *
return; return;
} }
if (GetRawInputDeviceList(devices, &device_count, sizeof(RAWINPUTDEVICELIST)) == -1) { device_count = GetRawInputDeviceList(devices, &device_count, sizeof(RAWINPUTDEVICELIST));
if (device_count == (UINT)-1) {
SDL_free(devices); SDL_free(devices);
return; /* oh well. */ return; /* oh well. */
} }