RaySollium99/libpicofe
1
0
Fork 0
mirror of https://github.com/RaySollium99/libpicofe.git synced 2025-09-07 07:38:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix crash if file list is empty in romsel

Browse source
This commit is contained in:
kub 2023-11-15 20:26:05 +00:00
parent 7b58e15633
commit d5a43fbd97
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
menu.c
View file

@ -1038,16 +1038,17 @@ rescan:
filter = scandir_filter; filter = scandir_filter;
n = scandir(curr_path, &namelist, filter, (void *)scandir_cmp); n = scandir(curr_path, &namelist, filter, (void *)scandir_cmp);
if (n < 0) { if (n < 0 || !namelist) {
lprintf("menu_loop_romsel failed, dir: %s\n", curr_path); lprintf("menu_loop_romsel failed, dir: %s\n", curr_path);
// try data root // try data root
plat_get_data_dir(curr_path, len); plat_get_data_dir(curr_path, len);
n = scandir(curr_path, &namelist, filter, (void *)scandir_cmp); n = scandir(curr_path, &namelist, filter, (void *)scandir_cmp);
if (n < 0) { if (n < 0 || !namelist) {
// oops, we failed // oops, we failed
lprintf("menu_loop_romsel failed, dir: %s\n", curr_path); lprintf("menu_loop_romsel failed, dir: %s\n", curr_path);
return NULL; namelist = malloc(sizeof(*namelist));
namelist[0] = calloc(1, sizeof(**namelist));
} }
} }
@ -1108,12 +1109,13 @@ rescan:
namelist[sel]->d_name); namelist[sel]->d_name);
goto rescan; goto rescan;
} }
if (inp & PBTN_UP ) { sel--; if (sel < 0) sel = n-1; } int last = n ? n-1 : 0;
if (inp & PBTN_UP ) { sel--; if (sel < 0) sel = last; }
else if (inp & PBTN_DOWN) { sel++; if (sel > n-1) sel = 0; } else if (inp & PBTN_DOWN) { sel++; if (sel > n-1) sel = 0; }
else if (inp & PBTN_LEFT) { sel-=10; if (sel < 0) sel = 0; } else if (inp & PBTN_LEFT) { sel-=10; if (sel < 0) sel = 0; }
else if (inp & PBTN_RIGHT) { sel+=10; if (sel > n-1) sel = n-1; } else if (inp & PBTN_RIGHT) { sel+=10; if (sel > n-1) sel = last; }
else if (inp & PBTN_L) { sel-=24; if (sel < 0) sel = 0; } else if (inp & PBTN_L) { sel-=24; if (sel < 0) sel = 0; }
else if (inp & PBTN_R) { sel+=24; if (sel > n-1) sel = n-1; } else if (inp & PBTN_R) { sel+=24; if (sel > n-1) sel = last; }
else if ((inp & PBTN_MOK) || (inp & (PBTN_MENU|PBTN_MA2)) == (PBTN_MENU|PBTN_MA2)) else if ((inp & PBTN_MOK) || (inp & (PBTN_MENU|PBTN_MA2)) == (PBTN_MENU|PBTN_MA2))
{ {