Skip to content

GitLab

Unverified Commit 529541f2 authored by Jianfeng Liu's avatar Jianfeng Liu Committed by GitHub
Browse files

fix Synchronous Exception on some arm cpus (#2488)

parent 430f81ac
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
View file @ 529541f2
...@@ -342,10 +342,12 @@ grub_file_read (grub_file_t file, void *buf, grub_size_t len) ...@@ -342,10 +342,12 @@ grub_file_read (grub_file_t file, void *buf, grub_size_t len)
if (len == 0) if (len == 0)
return 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); grub_memcpy(buf, (grub_uint8_t *)(file->data) + file->offset, len);
file->offset += len; file->offset += len;
return len; return len;
}
} }
read_hook = file->read_hook; read_hook = file->read_hook;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment