ethonion10/v86
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Multiboot loader: Allow bss section, add sanity check against memory size

Browse source
This commit is contained in:
Fabian 2017-07-26 11:21:28 +02:00
parent 9b463626fe
commit 7c9cdc75d3
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/cpu.js
View file

@ -904,9 +904,13 @@ CPU.prototype.load_multiboot = function(buffer)
// virtual and physical address must be equal
dbg_assert(program.paddr === program.vaddr);
dbg_assert(program.filesz <= program.memsz);
dbg_assert(program.paddr + program.memsz < this.memory_size[0]);
let blob = new Uint8Array(buffer, program.offset, program.filesz);
this.write_blob(blob, program.paddr);
if(program.filesz) // offset mighty be outside of buffer if filesz is 0
{
let blob = new Uint8Array(buffer, program.offset, program.filesz);
this.write_blob(blob, program.paddr);
}
}
else if(program.type === 4 ||
program.type === 0x6474e550 ||