M-Labs/artiq-zynq
10
1
Fork 19
Code Issues 12 Pull Requests Releases Wiki Activity

dyld: more fine grained errors

Browse Source
This commit is contained in:
Sebastien Bourdeauducq 2020-04-18 18:04:46 +08:00
parent e1190ec76c
commit c0aa4f78c2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libdyld/src/lib.rs
View File

@ -233,9 +233,11 @@ impl<'a> Library<'a> {
match phdr.p_type { match phdr.p_type {
PT_LOAD => { PT_LOAD => {
if (phdr.p_vaddr + phdr.p_filesz) as usize > image.len() || if (phdr.p_vaddr + phdr.p_filesz) as usize > image.len() {
(phdr.p_offset + phdr.p_filesz) as usize > data.len() { return Err("program header requests an out of bounds load (in image)")?
return Err("program header requests an out of bounds load")? }
if (phdr.p_offset + phdr.p_filesz) as usize > data.len() {
return Err("program header requests an out of bounds load (in data)")?
} }
let dst = image.get_mut(phdr.p_vaddr as usize.. let dst = image.get_mut(phdr.p_vaddr as usize..
(phdr.p_vaddr + phdr.p_filesz) as usize) (phdr.p_vaddr + phdr.p_filesz) as usize)