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

(task_content.c) Attempt to fix some coverity bugs

This commit is contained in:
twinaphex 2016-12-21 02:02:47 +01:00
parent bbed836e8f
commit 5f0efed08b
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tasks/task_content.c
View File

@ -395,6 +395,8 @@ static bool load_content_from_compressed_archive(
snprintf(str, sizeof(str), "%s \"%s\".\n", snprintf(str, sizeof(str), "%s \"%s\".\n",
msg_hash_to_str(MSG_COULD_NOT_READ_CONTENT_FILE), msg_hash_to_str(MSG_COULD_NOT_READ_CONTENT_FILE),
path); path);
if (error_string)
free(error_string);
error_string = strdup(str); error_string = strdup(str);
return false; return false;
} }
@ -488,13 +490,13 @@ static bool content_file_load(
struct retro_game_info *info, struct retro_game_info *info,
const struct string_list *content, const struct string_list *content,
content_information_ctx_t *content_ctx, content_information_ctx_t *content_ctx,
char *error_string,
const struct retro_subsystem_info *special const struct retro_subsystem_info *special
) )
{ {
unsigned i; unsigned i;
retro_ctx_load_content_info_t load_info; retro_ctx_load_content_info_t load_info;
char msg[1024]; char msg[1024];
char *error_string = NULL;
struct string_list *additional_path_allocs = string_list_new(); struct string_list *additional_path_allocs = string_list_new();
msg[0] = '\0'; msg[0] = '\0';
@ -613,6 +615,8 @@ static const struct retro_subsystem_info *content_file_init_subsystem(
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
"Failed to find subsystem \"%s\" in libretro implementation.\n", "Failed to find subsystem \"%s\" in libretro implementation.\n",
path_get(RARCH_PATH_SUBSYSTEM)); path_get(RARCH_PATH_SUBSYSTEM));
if (error_string)
free(error_string);
error_string = strdup(msg); error_string = strdup(msg);
goto error; goto error;
} }
@ -622,6 +626,8 @@ static const struct retro_subsystem_info *content_file_init_subsystem(
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
"%s\n", "%s\n",
msg_hash_to_str(MSG_ERROR_LIBRETRO_CORE_REQUIRES_SPECIAL_CONTENT)); msg_hash_to_str(MSG_ERROR_LIBRETRO_CORE_REQUIRES_SPECIAL_CONTENT));
if (error_string)
free(error_string);
error_string = strdup(msg); error_string = strdup(msg);
goto error; goto error;
} }
@ -632,6 +638,8 @@ static const struct retro_subsystem_info *content_file_init_subsystem(
"subsystem \"%s\", but %u content files were provided.\n", "subsystem \"%s\", but %u content files were provided.\n",
special->num_roms, special->desc, special->num_roms, special->desc,
(unsigned)subsystem->size); (unsigned)subsystem->size);
if (error_string)
free(error_string);
error_string = strdup(msg); error_string = strdup(msg);
goto error; goto error;
} }
@ -642,6 +650,8 @@ static const struct retro_subsystem_info *content_file_init_subsystem(
"but %u content files were provided.\n", "but %u content files were provided.\n",
special->desc, special->desc,
(unsigned)subsystem->size); (unsigned)subsystem->size);
if (error_string)
free(error_string);
error_string = strdup(msg); error_string = strdup(msg);
goto error; goto error;
} }
@ -741,7 +751,8 @@ static bool content_file_init(struct string_list *temporary_content,
if (info) if (info)
{ {
unsigned i; unsigned i;
ret = content_file_load(temporary_content, info, content, content_ctx, special); ret = content_file_load(temporary_content, info, content, content_ctx, error_string,
special);
for (i = 0; i < content->size; i++) for (i = 0; i < content->size; i++)
free((void*)info[i].data); free((void*)info[i].data);
@ -903,6 +914,8 @@ error:
snprintf(msg, sizeof(msg), "%s %s.\n", snprintf(msg, sizeof(msg), "%s %s.\n",
msg_hash_to_str(MSG_FAILED_TO_LOAD), msg_hash_to_str(MSG_FAILED_TO_LOAD),
name); name);
if (error_string)
free(error_string);
error_string = strdup(msg); error_string = strdup(msg);
} }
} }