From a1c4446f24161ead78e61cdeb4c378851ee330bd Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Mon, 1 Jun 2015 16:42:55 +0200 Subject: [PATCH] Prevent menu_entry_pathdir_extensions from crashing the app --- menu/menu_entry.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/menu/menu_entry.c b/menu/menu_entry.c index 2ed2ce1eb1..c9eca40685 100644 --- a/menu/menu_entry.c +++ b/menu/menu_entry.c @@ -332,8 +332,9 @@ int menu_entry_pathdir_set_value(uint32_t i, const char *s) void menu_entry_pathdir_extensions(uint32_t i, char *s, size_t len) { rarch_setting_t *setting = menu_entry_get_setting(i); - if (setting) - strlcpy(s, setting->values, len); + const char *extensions = setting ? setting->values : NULL; + if (setting && extensions) + strlcpy(s, extensions, len); } void menu_entry_reset(uint32_t i)