Skip to content

fix(pe32+): to_view should account for section alignment #274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CertainLach wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(pe32+): to_view should account for section alignment #274

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/pe64/file.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ PE file.

use std::prelude::v1::*;

use crate::util::AlignTo;
use crate::Result;

use super::pe::validate_headers;
Expand Down Expand Up @@ -41,9 +42,9 @@ impl<'a> PeFile<'a> {
}
/// Converts the file to section alignment.
pub fn to_view(self) -> Vec<u8> {
let (sizeof_headers, sizeof_image) = {
let (sizeof_headers, sizeof_image, section_alignment) = {
let optional_header = self.optional_header();
(optional_header.SizeOfHeaders, optional_header.SizeOfImage)
(optional_header.SizeOfHeaders, optional_header.SizeOfImage, optional_header.SectionAlignment)
};

// Zero fill the underlying image
Expand All @@ -60,11 +61,11 @@ impl<'a> PeFile<'a> {

// Copy the section file data
for section in self.section_headers() {
let dest = vec.get_mut(section.VirtualAddress as usize..u32::wrapping_add(section.VirtualAddress, section.VirtualSize) as usize);
let dest = vec.get_mut(section.VirtualAddress as usize..u32::wrapping_add(section.VirtualAddress, section.VirtualSize).align_to(section_alignment) as usize);
let src = image.get(section.PointerToRawData as usize..u32::wrapping_add(section.PointerToRawData, section.SizeOfRawData) as usize);
// Skip invalid sections...
if let (Some(dest), Some(src)) = (dest, src) {
dest.copy_from_slice(src);
dest[..src.len()].copy_from_slice(src);
}
}

Expand Down