fix Synchronous Exception on some arm cpus (#2488)

529541f2 · Jianfeng Liu · GitHub · 430f81ac · 529541f2
Unverified Commit 529541f2 authored Jul 20, 2023 by Jianfeng Liu Committed by GitHub Jul 20, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

GRUB2/MOD_SRC/grub-2.04/grub-core/kern/file.c GRUB2/MOD_SRC/grub-2.04/grub-core/kern/file.c +3 -1

No files found.
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/kern/file.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/kern/file.c
@@ -342,10 +342,12 @@ grub_file_read (grub_file_t file, void *buf, grub_size_t len)
  if (len == 0)
    return 0;

-  if (grub_strncmp(file->name, GRUB_MEMFILE_MEM, grub_strlen(GRUB_MEMFILE_MEM)) == 0) {
+  if (file->name) {
+    if (grub_strncmp(file->name, GRUB_MEMFILE_MEM, grub_strlen(GRUB_MEMFILE_MEM)) == 0) {
      grub_memcpy(buf, (grub_uint8_t *)(file->data) + file->offset, len);
      file->offset += len;
      return len;
+    }
  }
  
  read_hook = file->read_hook;