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

(menu_cbs_ok.c) Fix explicit NULL dereferenced warnings

This commit is contained in:
twinaphex 2016-06-05 19:04:59 +02:00
parent 693ce8f6e5
commit a6175a3989
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
menu/cbs/menu_cbs_ok.c
View File

@ -317,8 +317,10 @@ int generic_action_ok_displaylist_push(const char *path,
break; break;
} }
strlcpy(menu->scratch_buf, path, sizeof(menu->scratch_buf)); if (!string_is_empty(path))
strlcpy(menu->scratch2_buf, menu_path, sizeof(menu->scratch2_buf)); strlcpy(menu->scratch_buf, path, sizeof(menu->scratch_buf));
if (!string_is_empty(menu_path))
strlcpy(menu->scratch2_buf, menu_path, sizeof(menu->scratch2_buf));
break; break;
case ACTION_OK_DL_PARENT_DIRECTORY_PUSH: case ACTION_OK_DL_PARENT_DIRECTORY_PUSH:
fill_pathname_parent_dir(parent_dir, fill_pathname_parent_dir(parent_dir,
@ -1417,8 +1419,9 @@ static void cb_generic_download(void *task_data,
goto finish; goto finish;
} }
fill_pathname_join(output_path, dir_path, if (!string_is_empty(dir_path))
transf->path, sizeof(output_path)); fill_pathname_join(output_path, dir_path,
transf->path, sizeof(output_path));
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
file_ext = path_get_extension(output_path); file_ext = path_get_extension(output_path);