Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix tree.c->dirbrowse panic from database browser

Browse source 
I set up panics on invalid entries throughout tree.c
dirbrowser was checking for file attributes even when the result
was unused, the database browser called this code with an
invalid (to the tagcache) index

This patch fixes that oversight and also adds __func__ to the
panics for easier sleuthing in the future

Change-Id: Ie1d6511423bba48125e4916b1c3049c048abaee0
This commit is contained in:
William Wilgus 2018-12-20 20:41:21 -06:00
parent 28f91ff3dc
commit f08d218e67
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
apps/tree.c
View file

@ -137,7 +137,7 @@ static const char* tree_get_filename(int selected_item, void *data,
{ {
struct entry *entry = tree_get_entry_at(local_tc, selected_item); struct entry *entry = tree_get_entry_at(local_tc, selected_item);
if (!entry) if (!entry)
panicf("Invalid tree entry"); panicf("Invalid tree entry %s", __func__);
name = entry->name; name = entry->name;
attr = entry->attr; attr = entry->attr;
} }
@ -181,7 +181,7 @@ static int tree_get_filecolor(int selected_item, void * data)
struct tree_context * local_tc=(struct tree_context *)data; struct tree_context * local_tc=(struct tree_context *)data;
struct entry *entry = tree_get_entry_at(local_tc, selected_item); struct entry *entry = tree_get_entry_at(local_tc, selected_item);
if (!entry) if (!entry)
panicf("Invalid tree entry"); panicf("Invalid tree entry %s", __func__);
return filetype_get_color(entry->name, entry->attr); return filetype_get_color(entry->name, entry->attr);
} }
@ -200,7 +200,7 @@ static enum themable_icons tree_get_fileicon(int selected_item, void * data)
{ {
struct entry *entry = tree_get_entry_at(local_tc, selected_item); struct entry *entry = tree_get_entry_at(local_tc, selected_item);
if (!entry) if (!entry)
panicf("Invalid tree entry"); panicf("Invalid tree entry %s", __func__);
return filetype_get_icon(entry->attr); return filetype_get_icon(entry->attr);
} }
@ -225,7 +225,7 @@ static int tree_voice_cb(int selected_item, void * data)
{ {
struct entry *entry = tree_get_entry_at(local_tc, selected_item); struct entry *entry = tree_get_entry_at(local_tc, selected_item);
if (!entry) if (!entry)
panicf("Invalid tree entry"); panicf("Invalid tree entry %s", __func__);
name = entry->name; name = entry->name;
attr = entry->attr; attr = entry->attr;
@ -689,20 +689,20 @@ static int dirbrowse(void)
/* nothing to do if no files to display */ /* nothing to do if no files to display */
if ( numentries == 0 ) if ( numentries == 0 )
break; break;
if (tc.browse->flags & BROWSE_SELECTONLY)
struct entry *entry = tree_get_entry_at(&tc, tc.selected_item);
if (!entry)
panicf("Invalid tree entry");
short attr = entry->attr;
if ((tc.browse->flags & BROWSE_SELECTONLY) &&
!(attr & ATTR_DIRECTORY))
{ {
tc.browse->flags |= BROWSE_SELECTED; struct entry *entry = tree_get_entry_at(&tc, tc.selected_item);
get_current_file(tc.browse->buf, tc.browse->bufsize); if (!entry)
return GO_TO_PREVIOUS; panicf("Invalid tree entry %s", __func__);
}
short attr = entry->attr;
if(!(attr & ATTR_DIRECTORY))
{
tc.browse->flags |= BROWSE_SELECTED;
get_current_file(tc.browse->buf, tc.browse->bufsize);
return GO_TO_PREVIOUS;
}
}
#ifdef HAVE_TAGCACHE #ifdef HAVE_TAGCACHE
switch (id3db?tagtree_enter(&tc):ft_enter(&tc)) switch (id3db?tagtree_enter(&tc):ft_enter(&tc))
#else #else
@ -823,7 +823,7 @@ static int dirbrowse(void)
{ {
struct entry *entry = tree_get_entry_at(&tc, tc.selected_item); struct entry *entry = tree_get_entry_at(&tc, tc.selected_item);
if (!entry) if (!entry)
panicf("Invalid tree entry"); panicf("Invalid tree entry %s", __func__);
attr = entry->attr; attr = entry->attr;