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

Prevent null pointer dereference

This commit is contained in:
twinaphex 2016-09-22 21:57:55 +02:00
parent e8deea65a9
commit 7fdc38bf30
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
input/drivers/linuxraw_input.c
View File

@ -40,6 +40,7 @@ typedef struct linuxraw_input
static void *linuxraw_input_init(void) static void *linuxraw_input_init(void)
{ {
struct sigaction sa = {{0}};
linuxraw_input_t *linuxraw = NULL; linuxraw_input_t *linuxraw = NULL;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();

10
menu/menu_content.c
View File

@ -165,8 +165,14 @@ bool menu_content_find_first_core(menu_content_ctx_defer_info_t *def_info,
if (!string_is_empty(default_info_dir)) if (!string_is_empty(default_info_dir))
{ {
const char *default_info_path = def_info->path; const char *default_info_path = NULL;
size_t default_info_length = def_info->len; size_t default_info_length = 0;
if (def_info)
{
default_info_path = def_info->path;
default_info_length = def_info->len;
}
if (!string_is_empty(default_info_path)) if (!string_is_empty(default_info_path))
fill_pathname_join(def_info->s, fill_pathname_join(def_info->s,