From 7fa4724743fb687288eba28df902b36a69c47d4e Mon Sep 17 00:00:00 2001 From: longpanda Date: Tue, 7 Mar 2023 18:05:33 +0800 Subject: [PATCH] Fix the menu missing issue when there exist an invalid vlnk file. (#2228) --- GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_browser.c | 5 +++++ GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_cmd.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_browser.c b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_browser.c index 51e9557e..6b5a10e3 100644 --- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_browser.c +++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_browser.c @@ -392,6 +392,11 @@ static int ventoy_browser_iterate_dir(const char *filename, const struct grub_di return 0; } + if (grub_file_is_vlnk_suffix(filename, len)) + { + return 0; + } + node = grub_zalloc(sizeof(browser_node)); if (!node) { diff --git a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_cmd.c b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_cmd.c index 234a509b..ba3ed097 100644 --- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_cmd.c +++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_cmd.c @@ -1767,6 +1767,10 @@ static int ventoy_check_vlnk_data(ventoy_vlnk *vlnk, int print, char *dst, int s cur->fs->fs_close(&file); grub_snprintf(dst, size - 1, "(%s)%s", cur->device, vlnk->filepath); } + else + { + grub_errno = 0; + } } } }