From 778a3fffd19229e5650a1abfb06c974949991cd4 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Mon, 30 Nov 2020 10:36:00 -0300 Subject: [PATCH] loader/xnu: Check if pointer is NULL before using it Fixes: CID 73654 Signed-off-by: Paulo Flabiano Smorigo Reviewed-by: Daniel Kiper Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/grub.git/commit/?id=7c8a2b5d1421a0f2a33d33531f7561f3da93b844] Signed-off-by: Marta Rybczynska --- grub-core/loader/xnu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c index 39ceff8..adc048c 100644 --- a/grub-core/loader/xnu.c +++ b/grub-core/loader/xnu.c @@ -667,6 +667,9 @@ grub_xnu_load_driver (char *infoplistname, grub_file_t binaryfile, char *name, *nameend; int namelen; + if (infoplistname == NULL) + return grub_error (GRUB_ERR_BAD_FILENAME, N_("missing p-list filename")); + name = get_name_ptr (infoplistname); nameend = grub_strchr (name, '/'); @@ -698,10 +701,7 @@ grub_xnu_load_driver (char *infoplistname, grub_file_t binaryfile, else macho = 0; - if (infoplistname) - infoplist = grub_file_open (infoplistname, GRUB_FILE_TYPE_XNU_INFO_PLIST); - else - infoplist = 0; + infoplist = grub_file_open (infoplistname, GRUB_FILE_TYPE_XNU_INFO_PLIST); grub_errno = GRUB_ERR_NONE; if (infoplist) {