From 480755f8f00c2823ba636250cd32d432f112579d Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Tue, 24 May 2022 04:29:29 +0200 Subject: [PATCH] Revert "[yabridgectl] Don't resolve rvas when parsing" This reverts commit 6c1f7bd46908a9d6b3671975916e49b45fb5a558. Somehow disabling this option seems to cause goblin to deadlock when scanning at least one plugin. --- tools/yabridgectl/src/symbols.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tools/yabridgectl/src/symbols.rs b/tools/yabridgectl/src/symbols.rs index abf92a3e..d11c459d 100644 --- a/tools/yabridgectl/src/symbols.rs +++ b/tools/yabridgectl/src/symbols.rs @@ -46,12 +46,7 @@ fn parse_pe32_goblin>(binary: P) -> Result { // The original version of this function also supports ELF and Mach architectures, but we don't // need those things here let bytes = util::read(&binary)?; - let obj = goblin::pe::PE::parse_with_opts( - &bytes, - // We only care about the exports - &goblin::pe::options::ParseOptions { resolve_rva: false }, - ) - .with_context(|| { + let obj = goblin::pe::PE::parse(&bytes).with_context(|| { format!( "Could not parse '{}' as a PE32(+) binary", binary.as_ref().display()