From 1ad4e45a2ac2407f84d06a5bdcb16ff8b39cd2f1 Mon Sep 17 00:00:00 2001 From: Willi Ballenthin Date: Fri, 1 Nov 2024 13:06:14 +0000 Subject: [PATCH] core, bin: bump goblin to v0.9 closes #209 --- bin/Cargo.toml | 2 +- core/Cargo.toml | 2 +- core/src/loader/pe/mod.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/Cargo.toml b/bin/Cargo.toml index abe38c6..065eb4a 100644 --- a/bin/Cargo.toml +++ b/bin/Cargo.toml @@ -20,7 +20,7 @@ chrono = "0.4" anyhow = "1" thiserror = "1" better-panic = "0.3" -goblin = "0.6" +goblin = "0.9" # unreleased fixes for: https://github.com/mdsteele/rust-ar/issues/26 # otherwise just use 0.9 or next release. ar = { git = "https://github.com/mdsteele/rust-ar", rev = "03d664b", version = "0.9" } diff --git a/core/Cargo.toml b/core/Cargo.toml index 6ec01ce..2f06917 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -13,7 +13,7 @@ travis-ci = { repository = "https://github.com/williballenthin/lancelot", branch [dependencies] log = "0.4" -goblin = { version = "0.6", features = ["std", "pe32"], default-features = false } +goblin = { version = "0.9", features = ["std", "pe32"], default-features = false } object = "0.36" zydis = { features = ["wasm", "serialization"], optional = true, version = "3.1.3" } byteorder = "1" diff --git a/core/src/loader/pe/mod.rs b/core/src/loader/pe/mod.rs index 0f27c9e..704883e 100644 --- a/core/src/loader/pe/mod.rs +++ b/core/src/loader/pe/mod.rs @@ -82,7 +82,7 @@ impl PE { }; match opt_header.data_directories.data_directories[data_directory] { - Some(directory) => Ok(Some(DataDirectory { + Some((_, directory)) => Ok(Some(DataDirectory { address: self.module.address_space.base_address + directory.virtual_address as VA, size: directory.size as RVA, })),