From 1c7c106b06b6a88502801e699ef99e72b7c625cd Mon Sep 17 00:00:00 2001 From: Alex AUVOLAT Date: Thu, 17 May 2012 11:27:59 +0200 Subject: Fixed some nasty bugs. --- src/kernel/linker/elf.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/kernel/linker') diff --git a/src/kernel/linker/elf.cpp b/src/kernel/linker/elf.cpp index 9477e8a..29689a2 100644 --- a/src/kernel/linker/elf.cpp +++ b/src/kernel/linker/elf.cpp @@ -27,7 +27,7 @@ thread_entry elf_load(uint8_t *data, process* process) { (new simpleseg(phdr[i].p_vaddr, phdr[i].p_memsz, (phdr[i].p_flags & PF_W) != 0))->map(process->pagedir, 0); memcpy((uint8_t*)phdr[i].p_vaddr, data + phdr[i].p_offset, phdr[i].p_filesz); if (phdr[i].p_memsz > phdr[i].p_filesz) { - memset((uint8_t*)phdr[i].p_vaddr + phdr[i].p_memsz, 0, phdr[i].p_memsz - phdr[i].p_filesz); + memset((uint8_t*)((size_t)phdr[i].p_vaddr + phdr[i].p_filesz), 0, phdr[i].p_memsz - phdr[i].p_filesz); } if (phdr[i].p_vaddr + phdr[i].p_memsz > dataseg) { dataseg = phdr[i].p_vaddr + phdr[i].p_memsz; -- cgit v1.2.3