Merge branch 'trunk' into trunk

Author: iczelia

common/crypt/blake2b.c

@@ -5,7 +5,6 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <crypt/blake2b.h>
-#include <fs/file.h>
 #include <lib/libc.h>
 #include <lib/misc.h>
 #include <mm/pmm.h>

common/lib/image.c

@@ -40,7 +40,7 @@ struct image *image_open(struct file_handle *file) {
     if (image->img == NULL || x == 0 || y == 0) {
         if (image->img != NULL) {
             // stbi allocated but dimensions are degenerate
-            pmm_free(image->img, (size_t)x * (size_t)y * 4);
+            stbi_image_free(image->img);
         }
         pmm_free(image, sizeof(struct image));
         return NULL;
@@ -49,15 +49,15 @@ struct image *image_open(struct file_handle *file) {
     // Convert ABGR to XRGB
     uint32_t *pptr = (void *)image->img;
     size_t pixel_count = CHECKED_MUL((size_t)x, (size_t)y,
-        ({ pmm_free(image, sizeof(struct image)); return NULL; }));
+        ({ stbi_image_free(image->img); pmm_free(image, sizeof(struct image)); return NULL; }));
     for (size_t i = 0; i < pixel_count; i++) {
         pptr[i] = (pptr[i] & 0x0000ff00) | ((pptr[i] & 0x00ff0000) >> 16) | ((pptr[i] & 0x000000ff) << 16);
     }
 
     image->x_size = x;
     image->y_size = y;
     image->pitch = (int)CHECKED_MUL((size_t)x, 4,
-        ({ pmm_free(image, sizeof(struct image)); return NULL; }));
+        ({ stbi_image_free(image->img); pmm_free(image, sizeof(struct image)); return NULL; }));
     image->bpp = 32;
     image->img_width = x;
     image->img_height = y;

common/menu.c

@@ -1322,7 +1322,7 @@ noreturn void _menu(bool first_run) {
     }
 
     if (!skip_timeout && !timeout) {
-        if (max_entries == 0 || selected_menu_entry->sub != NULL) {
+        if (max_entries == 0 || selected_menu_entry == NULL || selected_menu_entry->sub != NULL) {
             quiet = false;
             print("Default entry is not valid or directory, booting to menu.\n");
             skip_timeout = true;