From 7fdc38bf30902dac784cefc38df7c1b6868d38ef Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 22 Sep 2016 21:57:55 +0200 Subject: [PATCH] Prevent null pointer dereference --- input/drivers/linuxraw_input.c | 1 + menu/menu_content.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/input/drivers/linuxraw_input.c b/input/drivers/linuxraw_input.c index f46c248513..e54fab2b36 100644 --- a/input/drivers/linuxraw_input.c +++ b/input/drivers/linuxraw_input.c @@ -40,6 +40,7 @@ typedef struct linuxraw_input static void *linuxraw_input_init(void) { + struct sigaction sa = {{0}}; linuxraw_input_t *linuxraw = NULL; settings_t *settings = config_get_ptr(); diff --git a/menu/menu_content.c b/menu/menu_content.c index 311481a260..30af25d8a1 100644 --- a/menu/menu_content.c +++ b/menu/menu_content.c @@ -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)) { - const char *default_info_path = def_info->path; - size_t default_info_length = def_info->len; + const char *default_info_path = NULL; + 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)) fill_pathname_join(def_info->s,