mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1366 from lioncash/leaks

Browse Source 
Some more leak/correctness fixes.
This commit is contained in:
Twinaphex 2015-01-28 18:49:08 +01:00
commit c94b80a723
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libretrodb/rmsgpack_dom.c
View File

@ -404,7 +404,10 @@ int rmsgpack_dom_read_into(int fd, ...)
(void)value_type; (void)value_type;
if (rv < 0) if (rv < 0)
{
va_end(ap);
return rv; return rv;
}
if (map.type != RDT_MAP) if (map.type != RDT_MAP)
{ {

9
menu/menu_entries_cbs.c
View File

@ -1446,11 +1446,12 @@ static int action_ok_rdb_entry_submenu(const char *path,
char *rdb = NULL; char *rdb = NULL;
int len = 0; int len = 0;
struct string_list *str_list = string_split(label, "|"); struct string_list *str_list = string_split(label, "|");
struct string_list *str_list2 = string_list_new(); struct string_list *str_list2 = NULL;
if (!str_list) if (!str_list)
return -1; return -1;
str_list2 = string_list_new();
if (!str_list2) if (!str_list2)
{ {
string_list_free(str_list); string_list_free(str_list);
@ -3818,7 +3819,7 @@ static int menu_entries_cbs_init_bind_ok_first(menu_file_list_cbs_t *cbs,
{ {
char elem0[PATH_MAX_LENGTH]; char elem0[PATH_MAX_LENGTH];
const char *menu_label = NULL; const char *menu_label = NULL;
struct string_list *str_list = string_split(label, "|"); struct string_list *str_list = NULL;
if (!driver.menu) if (!driver.menu)
return -1; return -1;
@ -3826,10 +3827,12 @@ static int menu_entries_cbs_init_bind_ok_first(menu_file_list_cbs_t *cbs,
menu_list_get_last_stack(driver.menu->menu_list, menu_list_get_last_stack(driver.menu->menu_list,
NULL, &menu_label, NULL); NULL, &menu_label, NULL);
str_list = string_split(label, "|");
if (str_list && str_list->size > 0) if (str_list && str_list->size > 0)
{
strlcpy(elem0, str_list->elems[0].data, sizeof(elem0)); strlcpy(elem0, str_list->elems[0].data, sizeof(elem0));
if (str_list)
{
string_list_free(str_list); string_list_free(str_list);
str_list = NULL; str_list = NULL;
} }