GUI: Fix array out of bounds in menu exit (flipperdevices#3604)

* GUI: Fix array out of bounds in menu exit * Gui: fix incorrect empty menu handling * Gui: add missing item check in menu ok handling * Gui: remove dead code from menu module Co-authored-by: あく <alleteam@gmail.com>
leedave · May 15, 2024 · dd30f2b · dd30f2b
1 parent c76c5f0
commit dd30f2b
Showing 1 changed file with 24 additions and 34 deletions.
diff --git a/applications/services/gui/modules/menu.c b/applications/services/gui/modules/menu.c
@@ -44,25 +44,19 @@ static void menu_draw_callback(Canvas* canvas, void* _model) {
         canvas_set_font(canvas, FontSecondary);
         shift_position = (0 + position + items_count - 1) % items_count;
         item = MenuItemArray_get(model->items, shift_position);
-        if(item->icon) {
-            canvas_draw_icon_animation(canvas, 4, 3, item->icon);
-        }
+        canvas_draw_icon_animation(canvas, 4, 3, item->icon);
         canvas_draw_str(canvas, 22, 14, item->label);
         // Second line main
         canvas_set_font(canvas, FontPrimary);
         shift_position = (1 + position + items_count - 1) % items_count;
         item = MenuItemArray_get(model->items, shift_position);
-        if(item->icon) {
-            canvas_draw_icon_animation(canvas, 4, 25, item->icon);
-        }
+        canvas_draw_icon_animation(canvas, 4, 25, item->icon);
         canvas_draw_str(canvas, 22, 36, item->label);
         // Third line
         canvas_set_font(canvas, FontSecondary);
         shift_position = (2 + position + items_count - 1) % items_count;
         item = MenuItemArray_get(model->items, shift_position);
-        if(item->icon) {
-            canvas_draw_icon_animation(canvas, 4, 47, item->icon);
-        }
+        canvas_draw_icon_animation(canvas, 4, 47, item->icon);
         canvas_draw_str(canvas, 22, 58, item->label);
         // Frame and scrollbar
         elements_frame(canvas, 0, 21, 128 - 5, 21);
@@ -107,8 +101,8 @@ static void menu_enter(void* context) {
         menu->view,
         MenuModel * model,
         {
-            MenuItem* item = MenuItemArray_get(model->items, model->position);
-            if(item && item->icon) {
+            if(MenuItemArray_size(model->items)) {
+                MenuItem* item = MenuItemArray_get(model->items, model->position);
                 icon_animation_start(item->icon);
             }
         },
@@ -121,8 +115,8 @@ static void menu_exit(void* context) {
         menu->view,
         MenuModel * model,
         {
-            MenuItem* item = MenuItemArray_get(model->items, model->position);
-            if(item && item->icon) {
+            if(MenuItemArray_size(model->items)) {
+                MenuItem* item = MenuItemArray_get(model->items, model->position);
                 icon_animation_stop(item->icon);
             }
         },
@@ -230,19 +224,17 @@ static void menu_process_up(Menu* menu) {
         menu->view,
         MenuModel * model,
         {
-            MenuItem* item = MenuItemArray_get(model->items, model->position);
-            if(item && item->icon) {
+            if(MenuItemArray_size(model->items)) {
+                MenuItem* item = MenuItemArray_get(model->items, model->position);
                 icon_animation_stop(item->icon);
-            }
 
-            if(model->position > 0) {
-                model->position--;
-            } else {
-                model->position = MenuItemArray_size(model->items) - 1;
-            }
+                if(model->position > 0) {
+                    model->position--;
+                } else {
+                    model->position = MenuItemArray_size(model->items) - 1;
+                }
 
-            item = MenuItemArray_get(model->items, model->position);
-            if(item && item->icon) {
+                item = MenuItemArray_get(model->items, model->position);
                 icon_animation_start(item->icon);
             }
         },
@@ -254,19 +246,17 @@ static void menu_process_down(Menu* menu) {
         menu->view,
         MenuModel * model,
         {
-            MenuItem* item = MenuItemArray_get(model->items, model->position);
-            if(item && item->icon) {
+            if(MenuItemArray_size(model->items)) {
+                MenuItem* item = MenuItemArray_get(model->items, model->position);
                 icon_animation_stop(item->icon);
-            }
 
-            if(model->position < MenuItemArray_size(model->items) - 1) {
-                model->position++;
-            } else {
-                model->position = 0;
-            }
+                if(model->position < MenuItemArray_size(model->items) - 1) {
+                    model->position++;
+                } else {
+                    model->position = 0;
+                }
 
-            item = MenuItemArray_get(model->items, model->position);
-            if(item && item->icon) {
+                item = MenuItemArray_get(model->items, model->position);
                 icon_animation_start(item->icon);
             }
         },
@@ -279,7 +269,7 @@ static void menu_process_ok(Menu* menu) {
         menu->view,
         MenuModel * model,
         {
-            if(model->position < MenuItemArray_size(model->items)) {
+            if(MenuItemArray_size(model->items)) {
                 item = MenuItemArray_get(model->items, model->position);
             }
         },