Fix crash with savestate thumbnails

This commit is contained in:
twinaphex 2017-09-30 07:10:58 +02:00
parent 638a441530
commit e376bd75c0
2 changed files with 6 additions and 1 deletions

View File

@ -1038,6 +1038,7 @@ static void xmb_update_savestate_thumbnail_path(void *data, unsigned i)
if (!string_is_empty(xmb->savestate_thumbnail_file_path))
free(xmb->savestate_thumbnail_file_path);
xmb->savestate_thumbnail_file_path = NULL;
if (!string_is_empty(entry.label))
{
@ -1067,7 +1068,11 @@ static void xmb_update_savestate_thumbnail_path(void *data, unsigned i)
strlcat(path, file_path_str(FILE_PATH_PNG_EXTENSION), path_size);
if (path_file_exists(path))
{
if (!string_is_empty(xmb->savestate_thumbnail_file_path))
free(xmb->savestate_thumbnail_file_path);
xmb->savestate_thumbnail_file_path = strdup(path);
}
free(path);
}

View File

@ -135,7 +135,7 @@ char *menu_entry_get_sublabel(menu_entry_t *entry)
void menu_entry_get_label(menu_entry_t *entry, char *s, size_t len)
{
if (!entry)
if (!entry || string_is_empty(entry->label))
return;
strlcpy(s, entry->label, len);
}