mount/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Archive: fix bounds crossing logic #760

Browse Source 
Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
its your bedtime 2021-10-13 12:53:58 +03:00 committed by GitHub
parent a3b69d8030
commit a643bd14be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
applications/archive/helpers/archive_browser.c
View File

@ -79,16 +79,24 @@ void archive_file_array_rm_selected(ArchiveBrowserView* browser) {
void archive_file_array_swap(ArchiveBrowserView* browser, int8_t d) { void archive_file_array_swap(ArchiveBrowserView* browser, int8_t d) {
with_view_model( with_view_model(
browser->view, (ArchiveBrowserViewModel * model) { browser->view, (ArchiveBrowserViewModel * model) {
ArchiveFile_t temp;
size_t array_size = files_array_size(model->files) - 1; size_t array_size = files_array_size(model->files) - 1;
uint8_t swap_idx = CLAMP(model->idx + d, array_size, 0); uint8_t swap_idx = CLAMP(model->idx + d, array_size, 0);
if(model->idx == 0 && d < 0) { if(model->idx == 0 && d < 0) {
swap_idx = array_size; ArchiveFile_t_init(&temp);
files_array_pop_at(&temp, model->files, array_size);
files_array_push_at(model->files, model->idx, temp);
ArchiveFile_t_clear(&temp);
} else if(model->idx == array_size && d > 0) { } else if(model->idx == array_size && d > 0) {
swap_idx = 0; ArchiveFile_t_init(&temp);
files_array_pop_at(&temp, model->files, model->last_idx);
files_array_push_at(model->files, array_size, temp);
ArchiveFile_t_clear(&temp);
} else {
files_array_swap_at(model->files, model->idx, swap_idx);
} }
files_array_swap_at(model->files, model->idx, swap_idx);
return false; return false;
}); });
} }