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

Archive: fix null dereference #1531 (#1532)

Browse Source
This commit is contained in:
SG 2022-08-04 14:34:04 +10:00 committed by GitHub
parent 4c499d9045
commit 4460010e76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
applications/archive/scenes/archive_scene_browser.c
View File

@ -92,8 +92,6 @@ bool archive_scene_browser_on_event(void* context, SceneManagerEvent event) {
ArchiveBrowserView* browser = archive->browser; ArchiveBrowserView* browser = archive->browser;
ArchiveFile_t* selected = archive_get_current_file(browser); ArchiveFile_t* selected = archive_get_current_file(browser);
const char* name = archive_get_name(browser);
bool known_app = archive_is_known_app(selected->type);
bool favorites = archive_get_tab(browser) == ArchiveTabFavorites; bool favorites = archive_get_tab(browser) == ArchiveTabFavorites;
bool consumed = false; bool consumed = false;
@ -108,18 +106,19 @@ bool archive_scene_browser_on_event(void* context, SceneManagerEvent event) {
consumed = true; consumed = true;
break; break;
case ArchiveBrowserEventFileMenuRun: case ArchiveBrowserEventFileMenuRun:
if(known_app) { if(archive_is_known_app(selected->type)) {
archive_run_in_app(browser, selected); archive_run_in_app(browser, selected);
archive_show_file_menu(browser, false); archive_show_file_menu(browser, false);
} }
consumed = true; consumed = true;
break; break;
case ArchiveBrowserEventFileMenuPin: case ArchiveBrowserEventFileMenuPin: {
const char* name = archive_get_name(browser);
if(favorites) { if(favorites) {
archive_favorites_delete(name); archive_favorites_delete(name);
archive_file_array_rm_selected(browser); archive_file_array_rm_selected(browser);
archive_show_file_menu(browser, false); archive_show_file_menu(browser, false);
} else if(known_app) { } else if(archive_is_known_app(selected->type)) {
if(archive_is_favorite("%s", name)) { if(archive_is_favorite("%s", name)) {
archive_favorites_delete("%s", name); archive_favorites_delete("%s", name);
} else { } else {
@ -128,12 +127,12 @@ bool archive_scene_browser_on_event(void* context, SceneManagerEvent event) {
archive_show_file_menu(browser, false); archive_show_file_menu(browser, false);
} }
consumed = true; consumed = true;
break; } break;
case ArchiveBrowserEventFileMenuRename: case ArchiveBrowserEventFileMenuRename:
if(favorites) { if(favorites) {
browser->callback(ArchiveBrowserEventEnterFavMove, browser->context); browser->callback(ArchiveBrowserEventEnterFavMove, browser->context);
} else if((known_app) && (selected->is_app == false)) { } else if((archive_is_known_app(selected->type)) && (selected->is_app == false)) {
archive_show_file_menu(browser, false); archive_show_file_menu(browser, false);
scene_manager_set_scene_state( scene_manager_set_scene_state(
archive->scene_manager, ArchiveAppSceneBrowser, SCENE_STATE_NEED_REFRESH); archive->scene_manager, ArchiveAppSceneBrowser, SCENE_STATE_NEED_REFRESH);