mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-03 10:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent explicit null dereferenced warnings

Browse Source
This commit is contained in:
twinaphex 2016-05-26 18:09:46 +02:00
parent a98616b45b
commit 03ded43280
10 changed files with 104 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
command.c
View File

@ -383,7 +383,7 @@ static bool command_verify(const char *cmd)
bool command_network_send(const char *cmd_) bool command_network_send(const char *cmd_)
{ {
bool ret; bool ret = false;
char *command = NULL; char *command = NULL;
char *save = NULL; char *save = NULL;
const char *cmd = NULL; const char *cmd = NULL;
@ -415,11 +415,14 @@ bool command_network_send(const char *cmd_)
if (port_) if (port_)
port = strtoul(port_, NULL, 0); port = strtoul(port_, NULL, 0);
RARCH_LOG("%s: \"%s\" to %s:%hu\n", if (cmd)
msg_hash_to_str(MSG_SENDING_COMMAND), {
cmd, host, (unsigned short)port); RARCH_LOG("%s: \"%s\" to %s:%hu\n",
msg_hash_to_str(MSG_SENDING_COMMAND),
cmd, host, (unsigned short)port);
ret = command_verify(cmd) && send_udp_packet(host, port, cmd); ret = command_verify(cmd) && send_udp_packet(host, port, cmd);
}
free(command); free(command);
return ret; return ret;
@ -1662,12 +1665,13 @@ bool command_event(enum event_command cmd, void *data)
unsigned idx = 0; unsigned idx = 0;
unsigned *window_scale = NULL; unsigned *window_scale = NULL;
runloop_ctl(RUNLOOP_CTL_GET_WINDOWED_SCALE, &window_scale); if (runloop_ctl(RUNLOOP_CTL_GET_WINDOWED_SCALE, &window_scale))
{
if (*window_scale == 0)
return false;
if (*window_scale == 0) settings->video.scale = *window_scale;
return false; }
settings->video.scale = *window_scale;
if (!settings->video.fullscreen) if (!settings->video.fullscreen)
command_event(CMD_EVENT_REINIT, NULL); command_event(CMD_EVENT_REINIT, NULL);

20
dynamic.c
View File

@ -824,16 +824,17 @@ bool rarch_environment_cb(unsigned cmd, void *data)
if (string_is_empty(settings->directory.system)) if (string_is_empty(settings->directory.system))
{ {
char *fullpath = NULL; char *fullpath = NULL;
runloop_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath); if (runloop_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath))
{
RARCH_WARN("SYSTEM DIR is empty, assume CONTENT DIR %s\n", RARCH_WARN("SYSTEM DIR is empty, assume CONTENT DIR %s\n",
fullpath); fullpath);
fill_pathname_basedir(global->dir.systemdir, fullpath, fill_pathname_basedir(global->dir.systemdir, fullpath,
sizeof(global->dir.systemdir)); sizeof(global->dir.systemdir));
}
*(const char**)data = global->dir.systemdir; *(const char**)data = global->dir.systemdir;
RARCH_LOG("Environ SYSTEM_DIRECTORY: \"%s\".\n", RARCH_LOG("Environ SYSTEM_DIRECTORY: \"%s\".\n",
global->dir.systemdir); global->dir.systemdir);
} }
else else
{ {
@ -898,7 +899,7 @@ bool rarch_environment_cb(unsigned cmd, void *data)
"L", "R", "L2", "R2", "L3", "R3", "L", "R", "L2", "R2", "L3", "R3",
}; };
memset(system->input_desc_btn, 0, memset(&system->input_desc_btn, 0,
sizeof(system->input_desc_btn)); sizeof(system->input_desc_btn));
desc = (const struct retro_input_descriptor*)data; desc = (const struct retro_input_descriptor*)data;
@ -998,7 +999,8 @@ bool rarch_environment_cb(unsigned cmd, void *data)
RARCH_LOG("Environ SET_KEYBOARD_CALLBACK.\n"); RARCH_LOG("Environ SET_KEYBOARD_CALLBACK.\n");
if (key_event) if (key_event)
*key_event = info->callback; *key_event = info->callback;
if (frontend_key_event)
if (frontend_key_event && key_event)
*frontend_key_event = *key_event; *frontend_key_event = *key_event;
break; break;
} }

2
libretro-common/file/config_file.c
View File

@ -302,10 +302,10 @@ static bool parse_line(config_file_t *conf,
struct config_entry_list *list, char *line) struct config_entry_list *list, char *line)
{ {
char *comment = NULL; char *comment = NULL;
char *key = (char*)malloc(9);
char *key_tmp = NULL; char *key_tmp = NULL;
size_t cur_size = 8; size_t cur_size = 8;
size_t idx = 0; size_t idx = 0;
char *key = (char*)malloc(9);
if (!key) if (!key)
return false; return false;

7
libretro-common/queues/task_queue.c
View File

@ -244,8 +244,11 @@ static void retro_task_regular_retrieve(task_retriever_data_t *data)
} }
else else
{ {
tail->next = info; if (tail)
tail = tail->next; {
tail->next = info;
tail = tail->next;
}
} }
} }
} }

17
menu/drivers/materialui.c
View File

@ -685,18 +685,19 @@ static int mui_get_core_title(char *s, size_t len)
core_name = system->library_name; core_name = system->library_name;
core_version = system->library_version; core_version = system->library_version;
runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &info);
if (!settings->menu.core_enable) if (!settings->menu.core_enable)
return -1; return -1;
if (string_is_empty(core_name)) if (runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &info))
core_name = info->info.library_name; {
if (string_is_empty(core_name)) if (string_is_empty(core_name))
core_name = menu_hash_to_str(MENU_VALUE_NO_CORE); core_name = info->info.library_name;
if (!core_version)
core_version = info->info.library_version;
}
if (!core_version) if (string_is_empty(core_name))
core_version = info->info.library_version; core_name = menu_hash_to_str(MENU_VALUE_NO_CORE);
if (!core_version) if (!core_version)
core_version = ""; core_version = "";

5
menu/menu_entries.c
View File

@ -289,13 +289,14 @@ static bool menu_entries_elem_is_dir(file_list_t *list,
static int menu_entries_elem_get_first_char( static int menu_entries_elem_get_first_char(
file_list_t *list, unsigned offset) file_list_t *list, unsigned offset)
{ {
int ret; int ret = 0;
const char *path = NULL; const char *path = NULL;
menu_entries_get_at_offset(list, offset, menu_entries_get_at_offset(list, offset,
NULL, NULL, NULL, NULL, &path); NULL, NULL, NULL, NULL, &path);
ret = tolower((int)*path); if (path != NULL)
ret = tolower((int)*path);
/* "Normalize" non-alphabetical entries so they /* "Normalize" non-alphabetical entries so they
* are lumped together for purposes of jumping. */ * are lumped together for purposes of jumping. */

7
menu/menu_input.c
View File

@ -1081,12 +1081,9 @@ static int menu_input_pointer_post_iterate(
int ret = 0; int ret = 0;
menu_input_t *menu_input = menu_input_get_ptr(); menu_input_t *menu_input = menu_input_get_ptr();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
bool check_overlay = false; bool check_overlay = settings ? !settings->menu.pointer.enable : false;
if (settings)
check_overlay = !settings->menu.pointer.enable;
if (!menu_input) if (!menu_input || !settings)
return -1; return -1;
if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection)) if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection))
return -1; return -1;

38
menu/menu_setting.c
View File

@ -1065,22 +1065,23 @@ static void setting_get_string_representation_uint_libretro_device(void *data,
unsigned index_offset; unsigned index_offset;
const struct retro_controller_description *desc = NULL; const struct retro_controller_description *desc = NULL;
const char *name = NULL; const char *name = NULL;
rarch_system_info_t *system = NULL;
rarch_setting_t *setting = (rarch_setting_t*)data; rarch_setting_t *setting = (rarch_setting_t*)data;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
rarch_system_info_t *system = NULL;
runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system);
if (!setting) if (!setting)
return; return;
index_offset = menu_setting_get_index_offset(setting); index_offset = menu_setting_get_index_offset(setting);
if (index_offset < system->ports.size) if (runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system))
desc = libretro_find_controller_description( {
&system->ports.data[index_offset], if (index_offset < system->ports.size)
settings->input.libretro_device desc = libretro_find_controller_description(
[index_offset]); &system->ports.data[index_offset],
settings->input.libretro_device
[index_offset]);
}
if (desc) if (desc)
name = desc->desc; name = desc->desc;
@ -2346,11 +2347,9 @@ static int setting_action_start_libretro_device_type(void *data)
unsigned index_offset, current_device; unsigned index_offset, current_device;
unsigned devices[128], types = 0, port = 0; unsigned devices[128], types = 0, port = 0;
const struct retro_controller_info *desc = NULL; const struct retro_controller_info *desc = NULL;
rarch_setting_t *setting = (rarch_setting_t*)data;
settings_t *settings = config_get_ptr();
rarch_system_info_t *system = NULL; rarch_system_info_t *system = NULL;
settings_t *settings = config_get_ptr();
runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system); rarch_setting_t *setting = (rarch_setting_t*)data;
if (setting_generic_action_start_default(setting) != 0) if (setting_generic_action_start_default(setting) != 0)
return -1; return -1;
@ -2361,13 +2360,16 @@ static int setting_action_start_libretro_device_type(void *data)
devices[types++] = RETRO_DEVICE_NONE; devices[types++] = RETRO_DEVICE_NONE;
devices[types++] = RETRO_DEVICE_JOYPAD; devices[types++] = RETRO_DEVICE_JOYPAD;
/* Only push RETRO_DEVICE_ANALOG as default if we use an if (runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system))
* older core which doesn't use SET_CONTROLLER_INFO. */ {
if (!system->ports.size) /* Only push RETRO_DEVICE_ANALOG as default if we use an
devices[types++] = RETRO_DEVICE_ANALOG; * older core which doesn't use SET_CONTROLLER_INFO. */
if (!system->ports.size)
devices[types++] = RETRO_DEVICE_ANALOG;
desc = port < system->ports.size ? desc = port < system->ports.size ?
&system->ports.data[port] : NULL; &system->ports.data[port] : NULL;
}
if (desc) if (desc)
{ {

49
retroarch.c
View File

@ -1099,7 +1099,7 @@ static void retroarch_init_savefile_paths(void)
global->savefiles = string_list_new(); global->savefiles = string_list_new();
retro_assert(global->savefiles); retro_assert(global->savefiles);
if (*global->subsystem) if (system && *global->subsystem)
{ {
/* For subsystems, we know exactly which RAM types are supported. */ /* For subsystems, we know exactly which RAM types are supported. */
@ -1317,35 +1317,36 @@ bool retroarch_main_init(int argc, char *argv[])
settings->multimedia.builtin_imageviewer_enable)) settings->multimedia.builtin_imageviewer_enable))
{ {
char *fullpath = NULL; char *fullpath = NULL;
#if defined(HAVE_FFMPEG) || defined(HAVE_IMAGEVIEWER)
global_t *global = global_get_ptr();
#endif
runloop_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath); if (runloop_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath))
switch (retroarch_path_is_media_type(fullpath))
{ {
case RARCH_CONTENT_MOVIE: #if defined(HAVE_FFMPEG) || defined(HAVE_IMAGEVIEWER)
case RARCH_CONTENT_MUSIC: global_t *global = global_get_ptr();
if (settings->multimedia.builtin_mediaplayer_enable) #endif
{ switch (retroarch_path_is_media_type(fullpath))
{
case RARCH_CONTENT_MOVIE:
case RARCH_CONTENT_MUSIC:
if (settings->multimedia.builtin_mediaplayer_enable)
{
#ifdef HAVE_FFMPEG #ifdef HAVE_FFMPEG
global->has_set.libretro = false; global->has_set.libretro = false;
current_core_type = CORE_TYPE_FFMPEG; current_core_type = CORE_TYPE_FFMPEG;
#endif #endif
} }
break; break;
#ifdef HAVE_IMAGEVIEWER #ifdef HAVE_IMAGEVIEWER
case RARCH_CONTENT_IMAGE: case RARCH_CONTENT_IMAGE:
if (settings->multimedia.builtin_imageviewer_enable) if (settings->multimedia.builtin_imageviewer_enable)
{ {
global->has_set.libretro = false; global->has_set.libretro = false;
current_core_type = CORE_TYPE_IMAGEVIEWER; current_core_type = CORE_TYPE_IMAGEVIEWER;
} }
break; break;
#endif #endif
default: default:
break; break;
}
} }
} }
} }

23
tasks/task_content.c
View File

@ -168,9 +168,9 @@ static int content_7zip_file_read(
{ {
CFileInStream archiveStream; CFileInStream archiveStream;
CLookToRead lookStream; CLookToRead lookStream;
CSzArEx db;
ISzAlloc allocImp; ISzAlloc allocImp;
ISzAlloc allocTempImp; ISzAlloc allocTempImp;
CSzArEx db = {0};
uint8_t *output = 0; uint8_t *output = 0;
long outsize = -1; long outsize = -1;
@ -232,8 +232,10 @@ static int content_7zip_file_read(
} }
SzArEx_GetFileNameUtf16(&db, i, temp); SzArEx_GetFileNameUtf16(&db, i, temp);
res = utf16_to_char_string(temp, infile, sizeof(infile)) res = SZ_ERROR_FAIL;
? SZ_OK : SZ_ERROR_FAIL; if (temp)
res = utf16_to_char_string(temp, infile, sizeof(infile))
? SZ_OK : SZ_ERROR_FAIL;
if (string_is_equal(infile, needle)) if (string_is_equal(infile, needle))
{ {
@ -309,9 +311,9 @@ static struct string_list *compressed_7zip_file_list_new(
{ {
CFileInStream archiveStream; CFileInStream archiveStream;
CLookToRead lookStream; CLookToRead lookStream;
CSzArEx db;
ISzAlloc allocImp; ISzAlloc allocImp;
ISzAlloc allocTempImp; ISzAlloc allocTempImp;
CSzArEx db = {0};
size_t temp_size = 0; size_t temp_size = 0;
struct string_list *list = NULL; struct string_list *list = NULL;
@ -379,8 +381,12 @@ static struct string_list *compressed_7zip_file_list_new(
} }
SzArEx_GetFileNameUtf16(&db, i, temp); SzArEx_GetFileNameUtf16(&db, i, temp);
res = utf16_to_char_string(temp, infile, sizeof(infile)) res = SZ_ERROR_FAIL;
? SZ_OK : SZ_ERROR_FAIL;
if (temp)
res = utf16_to_char_string(temp, infile, sizeof(infile))
? SZ_OK : SZ_ERROR_FAIL;
file_ext = path_get_extension(infile); file_ext = path_get_extension(infile);
if (string_list_find_elem_prefix(ext_list, ".", file_ext)) if (string_list_find_elem_prefix(ext_list, ".", file_ext))
@ -1364,9 +1370,8 @@ static bool init_content_file_set_attribs(
else else
{ {
char *fullpath = NULL; char *fullpath = NULL;
runloop_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath); if (runloop_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath))
string_list_append(content, fullpath, attr);
string_list_append(content, fullpath, attr);
} }
} }