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

(XMB) Fix segfault

This commit is contained in:
Higor Eurípedes 2015-06-15 14:36:16 -03:00
parent b304ddcf7a
commit 1239b56d8a
2 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
menu/cbs/menu_cbs_iterate.c
View File

@ -542,6 +542,7 @@ static int action_iterate_main(const char *label, unsigned action)
break; break;
case ITERATE_TYPE_DEFAULT: case ITERATE_TYPE_DEFAULT:
selected = menu_navigation_get_current_selection(); selected = menu_navigation_get_current_selection();
/* FIXME: selected > selection_buf->list->size, i don't know why. */
selected = max(min(selected, menu_list_get_size(menu_list)-1), 0); selected = max(min(selected, menu_list_get_size(menu_list)-1), 0);
menu_entry_get(&entry, selected, NULL, false); menu_entry_get(&entry, selected, NULL, false);

47
menu/drivers/xmb.c
View File

@ -1602,13 +1602,7 @@ static void xmb_free(void *data)
return; return;
if (xmb->menu_stack_old) if (xmb->menu_stack_old)
{ file_list_free(xmb->menu_stack_old);
/* list nodes are owned by menu->menu_list->menu_stack */
if (xmb->menu_stack_old->list)
free(xmb->menu_stack_old->list);
free(xmb->menu_stack_old);
}
xmb->menu_stack_old = NULL; xmb->menu_stack_old = NULL;
if (xmb->selection_buf_old) if (xmb->selection_buf_old)
@ -1958,6 +1952,41 @@ static void xmb_list_free(file_list_t *list,
{ {
} }
static void xmb_list_deep_copy(menu_handle_t *menu, const file_list_t *src, file_list_t *dst)
{
size_t size, i;
size = dst->size;
for (i = 0; i < size; ++i)
{
file_list_free_userdata(dst, i);
file_list_free_actiondata(dst, i);
}
file_list_copy(src, dst);
size = dst->size;
for (i = 0; i < size; ++i)
{
void *src_udata = file_list_get_userdata_at_offset(src, i);
void *src_adata = file_list_get_actiondata_at_offset(src, i);
if (src_udata)
{
void *data = calloc(sizeof(xmb_node_t), 1);
memcpy(data, src_udata, sizeof(xmb_node_t));
file_list_set_userdata(dst, i, data);
}
if (src_adata)
{
void *data = calloc(sizeof(menu_file_list_cbs_t), 1);
memcpy(data, src_adata, sizeof(menu_file_list_cbs_t));
file_list_set_actiondata(dst, i, data);
}
}
}
static void xmb_list_cache(menu_list_type_t type, unsigned action) static void xmb_list_cache(menu_list_type_t type, unsigned action)
{ {
size_t stack_size, list_size; size_t stack_size, list_size;
@ -1974,8 +2003,8 @@ static void xmb_list_cache(menu_list_type_t type, unsigned action)
if (!xmb) if (!xmb)
return; return;
file_list_copy(menu_list->selection_buf, xmb->selection_buf_old); xmb_list_deep_copy(menu, menu_list->selection_buf, xmb->selection_buf_old);
file_list_copy(menu_list->menu_stack, xmb->menu_stack_old); xmb_list_deep_copy(menu, menu_list->menu_stack, xmb->menu_stack_old);
xmb->selection_ptr_old = nav->selection_ptr; xmb->selection_ptr_old = nav->selection_ptr;
switch (type) switch (type)