From 48ba5c0c86ee1bf17fb7f09c962aa6d8415a6ed1 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sun, 15 Dec 2013 14:33:22 +0100 Subject: [PATCH] * grub-core/kern/elfXX.c: Use grub_addr_t rather than long when appropriate. --- ChangeLog | 5 +++++ grub-core/kern/elfXX.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 506b85dbc..8bc99c121 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-12-15 Vladimir Serbinenko + + * grub-core/kern/elfXX.c: Use grub_addr_t rather than long when + appropriate. + 2013-12-15 Vladimir Serbinenko * grub-core/disk/loopback.c: Use sequential IDs rather than pointer. diff --git a/grub-core/kern/elfXX.c b/grub-core/kern/elfXX.c index 2e4544919..1d0997186 100644 --- a/grub-core/kern/elfXX.c +++ b/grub-core/kern/elfXX.c @@ -141,7 +141,7 @@ grub_elfXX_load (grub_elf_t elf, const char *filename, } if (phdr->p_filesz < phdr->p_memsz) - grub_memset ((void *) (long) (load_addr + phdr->p_filesz), + grub_memset ((void *) (grub_addr_t) (load_addr + phdr->p_filesz), 0, phdr->p_memsz - phdr->p_filesz); load_size += phdr->p_memsz;