Support ELF with empty PT_DYNAMIC reference (#193)

m4b · Dec 3, 2019 · e5ff551 · e5ff551
1 parent ea3377a
commit e5ff551
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/elf/dynamic.rs b/src/elf/dynamic.rs
@@ -372,10 +372,14 @@ if_alloc! {
                     let offset = phdr.p_offset as usize;
                     let filesz = phdr.p_filesz as usize;
                     // Ensure offset and filesz are valid.
-                    let bytes = bytes
-                        .pread_with::<&[u8]>(offset, filesz)
-                        .map_err(|_| crate::error::Error::Malformed(format!("Invalid PT_DYNAMIC size (offset {:#x}, filesz {:#x})",
-                                                               offset, filesz)))?;
+                    let bytes = if filesz > 0 {
+                        bytes
+                            .pread_with::<&[u8]>(offset, filesz)
+                            .map_err(|_| crate::error::Error::Malformed(format!("Invalid PT_DYNAMIC size (offset {:#x}, filesz {:#x})",
+                                                               offset, filesz)))?
+                    } else {
+                        &[]
+                    };
                     let size = Dyn::size_with(&ctx);
                     let count = filesz / size;
                     let mut dyns = Vec::with_capacity(count);