Support Goblin 0.10 alongside 0.9 (#5337)

Author: Tpt

newsfragments/5337.changed.md

@@ -0,0 +1 @@
+Introspection: add compatibility with Goblin 0.10

pyo3-introspection/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1"
-goblin = "0.9.0"
+goblin = ">=0.9, <0.11"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 unicode-ident = "1"

pyo3-introspection/src/introspection.rs

@@ -328,7 +328,7 @@ fn find_introspection_chunks_in_pe(pe: &PE<'_>, library_content: &[u8]) -> Resul
         .iter()
         .find(|section| section.name().unwrap_or_default() == ".rdata")
         .context("No .rdata section found")?;
-    let rdata_shift = pe.image_base
+    let rdata_shift = usize::try_from(pe.image_base).context("image_base overflow")?
         + usize::try_from(rdata_data_section.virtual_address)
             .context(".rdata virtual_address overflow")?
         - usize::try_from(rdata_data_section.pointer_to_raw_data)