libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 08:30:16 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Merge pull request #4689 from libretro/coverity_scan

Browse Source 
Coverity scan
This commit is contained in:
Twinaphex 2017-02-23 21:35:33 +01:00 committed by GitHub
commit 6146daf5e8
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
menu/cbs/menu_cbs_ok.c
View File

@ -250,8 +250,6 @@ int generic_action_ok_displaylist_push(const char *path,
settings_t *settings = config_get_ptr();
file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0);
if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu))
return menu_cbs_exit();
new_path_tmp[0] = tmp[0] = parent_dir[0] = action_path[0] = '\0';
@ -283,6 +281,9 @@ int generic_action_ok_displaylist_push(const char *path,
dl_type = DISPLAYLIST_GENERIC;
break;
case ACTION_OK_DL_OPEN_ARCHIVE_DETECT_CORE:
if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu))
return menu_cbs_exit();
if (menu)
{
menu_path = menu->scratch2_buf;
@ -2128,8 +2129,8 @@ static int action_ok_deferred_list_stub(const char *path,
static int action_ok_load_core_deferred(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)
{
content_ctx_info_t content_info = {0};
menu_handle_t *menu = NULL;
content_ctx_info_t content_info = {0};
if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu))
return menu_cbs_exit();

8
menu/cbs/menu_cbs_scan.c
View File

@ -53,14 +53,10 @@ int action_scan_file(const char *path,
enum msg_hash_enums enum_idx = MSG_UNKNOWN;
const char *menu_label = NULL;
const char *menu_path = NULL;
menu_handle_t *menu = NULL;
settings_t *settings = config_get_ptr();
fullpath[0] = '\0';
if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu))
return menu_cbs_exit();
menu_entries_get_last_stack(&menu_path, &menu_label, NULL, &enum_idx, NULL);
fill_pathname_join(fullpath, menu_path, path, sizeof(fullpath));
@ -80,14 +76,10 @@ int action_scan_directory(const char *path,
enum msg_hash_enums enum_idx = MSG_UNKNOWN;
const char *menu_label = NULL;
const char *menu_path = NULL;
menu_handle_t *menu = NULL;
settings_t *settings = config_get_ptr();
fullpath[0] = '\0';
if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu))
return menu_cbs_exit();
menu_entries_get_last_stack(&menu_path, &menu_label, NULL, &enum_idx, NULL);
strlcpy(fullpath, menu_path, sizeof(fullpath));