mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 00:39:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix another crash bug in joypad_connect

Browse Source 
== DETAILS

I fixed a similar bug in a past commit, with the same root cause: making
assumptions about the length of the array.

- Add validation to joypad_connection_init() so that if >MAX_USERS is
  requested, a warning is logged and only MAX_USERS is allocated.
- Rewrote the iteration routines so they strictly use the
  joypad_is_end_of_list() method to detect the end.
This commit is contained in:
gblues 2017-12-30 16:36:54 -08:00
parent 1b6870b180
commit 11fed40c79
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
input/connect/joypad_connection.c
View File

@ -24,22 +24,22 @@
#include "joypad_connection.h"
static bool joypad_is_end_of_list(joypad_connection_t *pad);
int pad_connection_find_vacant_pad(joypad_connection_t *joyconn)
{
unsigned i;
unsigned i;
if (!joyconn)
return -1;
if (!joyconn)
return -1;
for (i = 0; i < MAX_USERS; i++)
{
joypad_connection_t *conn = &joyconn[i];
for (i = 0; !joypad_is_end_of_list(&joyconn[i]); i++)
{
if(!joyconn[i].connected)
return i;
}
if (conn && !conn->connected)
return i;
}
return -1;
return -1;
}
static void set_end_of_list(joypad_connection_t *list, unsigned end)
@ -62,6 +62,14 @@ static bool joypad_is_end_of_list(joypad_connection_t *pad) {
joypad_connection_t *pad_connection_init(unsigned pads)
{
unsigned i;
if(pads > MAX_USERS)
{
RARCH_WARN("[joypad] invalid number of pads requested (%d), using default (%d)\n",
pads, MAX_USERS);
pads = MAX_USERS;
}
joypad_connection_t *joyconn = (joypad_connection_t*)
calloc(pads+1, sizeof(joypad_connection_t));
@ -226,13 +234,8 @@ void pad_connection_destroy(joypad_connection_t *joyconn)
{
unsigned i;
for (i = 0; i < MAX_USERS; i ++)
{
if(joypad_is_end_of_list(&joyconn[i]))
break;
for (i = 0; !joypad_is_end_of_list(&joyconn[i]); i ++)
pad_connection_pad_deinit(&joyconn[i], i);
}
free(joyconn);
}