mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-26 15:39:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1020 from lioncash/leak

Browse Source 
Fix a few memory leaks
This commit is contained in:
Twinaphex 2014-09-15 17:31:24 +02:00
commit e1ddd908fe
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
conf/config_file.c
View File

@ -291,12 +291,15 @@ static bool parse_line(config_file_t *conf,
size_t cur_size = 8; size_t cur_size = 8;
size_t index = 0; size_t index = 0;
if (!line || !*line)
return false;
if (!key) if (!key)
return false; return false;
if (!line || !*line)
{
free(key);
return false;
}
comment = strip_comment(line); comment = strip_comment(line);
/* Starting line with # and include includes config files. */ /* Starting line with # and include includes config files. */
@ -306,6 +309,7 @@ static bool parse_line(config_file_t *conf,
if (strstr(comment, "include ") == comment) if (strstr(comment, "include ") == comment)
{ {
add_sub_conf(conf, comment + strlen("include ")); add_sub_conf(conf, comment + strlen("include "));
free(key);
return false; return false;
} }
} }

11
frontend/menu/disp/lakka.c
View File

@ -1122,6 +1122,12 @@ static void *lakka_init(void)
categories = (menu_category_t*) categories = (menu_category_t*)
calloc(num_categories, sizeof(menu_category_t)); calloc(num_categories, sizeof(menu_category_t));
if (!categories)
{
free(menu);
return NULL;
}
lakka_init_settings(); lakka_init_settings();
for (i = 1; i < num_categories; i++) for (i = 1; i < num_categories; i++)
@ -1137,7 +1143,10 @@ static void *lakka_init(void)
info = (core_info_t*)&info_list->list[i-1]; info = (core_info_t*)&info_list->list[i-1];
if (info == NULL) if (info == NULL)
return NULL; {
free(menu);
return NULL
};
strlcpy(category->name, info->display_name, sizeof(category->name)); strlcpy(category->name, info->display_name, sizeof(category->name));
strlcpy(category->libretro, info->path, sizeof(category->libretro)); strlcpy(category->libretro, info->path, sizeof(category->libretro));