ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1568 from lioncash/retval 

hid: Fix return of potentially uninitialized pointers
This commit is contained in:
Twinaphex 2015-04-02 15:45:22 +02:00
parent d3db9d2335 c947b4c6a2
commit d9b96374f0
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
input/drivers_hid/apple_hid.c
View File

@ -442,7 +442,7 @@ static void *apple_hid_init(void)
error: error:
if (hid_apple) if (hid_apple)
free(hid_apple); free(hid_apple);
return hid_apple; return NULL;
} }
static void apple_hid_free(void *data) static void apple_hid_free(void *data)

12
input/drivers_hid/null_hid.c
View File

@ -75,17 +75,7 @@ static int16_t null_hid_joypad_axis(void *data, unsigned port, uint32_t joyaxis)
static void *null_hid_init(void) static void *null_hid_init(void)
{ {
null_hid_t *hid_null = (null_hid_t*)calloc(1, sizeof(*hid_null)); return (null_hid_t*)calloc(1, sizeof(null_hid_t));
if (!hid_null)
goto error;
return hid_null;
error:
if (hid_null)
free(hid_null);
return hid_null;
} }
static void null_hid_free(void *data) static void null_hid_free(void *data)