Fix use-after free in removeSingleItemFromMenu()

AEFeinstein · Oct 28, 2023 · bddb3b0 · bddb3b0
1 parent c23e563
commit bddb3b0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/main/menu/menu.c b/main/menu/menu.c
@@ -219,7 +219,6 @@ void removeSingleItemFromMenu(menu_t* menu, const char* label)
         menuItem_t* item = listNode->val;
         if (item->label == label)
         {
-            removeEntry(menu->items, listNode);
             if (menu->currentItem == listNode)
             {
                 if (NULL != listNode->next)
@@ -231,6 +230,7 @@ void removeSingleItemFromMenu(menu_t* menu, const char* label)
                     menu->currentItem = listNode->prev;
                 }
             }
+            removeEntry(menu->items, listNode);
             free(item);
             return;
         }