Use RVA for PE symbols

benfred · Nov 1, 2024 · ae1e218 · ae1e218
1 parent 68d418b
commit ae1e218
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/src/binary_parser.rs b/src/binary_parser.rs
@@ -234,10 +234,8 @@ pub fn parse_binary(filename: &Path, addr: u64, size: u64) -> Result<BinaryInfo,
         Object::PE(pe) => {
             for export in pe.exports {
                 if let Some(name) = export.name {
-                    if let Some(export_offset) = export.offset {
-                        if let Some(addr) = offset.checked_add(export_offset as u64) {
-                            symbols.insert(name.to_string(), addr);
-                        }
+                    if let Some(addr) = offset.checked_add(export.rva as u64) {
+                        symbols.insert(name.to_string(), addr);
                     }
                 }
             }

diff --git a/src/python_process_info.rs b/src/python_process_info.rs
@@ -75,7 +75,14 @@ impl PythonProcessInfo {
             let map = maps.iter().find(|m| {
                 if let Some(pathname) = m.filename() {
                     if let Some(pathname) = pathname.to_str() {
-                        return is_python_bin(pathname) && m.is_exec();
+                        #[cfg(not(windows))]
+                        {
+                            return is_python_bin(pathname) && m.is_exec();
+                        }
+                        #[cfg(windows)]
+                        {
+                            return is_python_bin(pathname);
+                        }
                     }
                 }
                 false
@@ -139,7 +146,14 @@ impl PythonProcessInfo {
             let libmap = maps.iter().find(|m| {
                 if let Some(pathname) = m.filename() {
                     if let Some(pathname) = pathname.to_str() {
-                        return is_python_lib(pathname) && m.is_exec();
+                        #[cfg(not(windows))]
+                        {
+                            return is_python_lib(pathname) && m.is_exec();
+                        }
+                        #[cfg(windows)]
+                        {
+                            return is_python_lib(pathname);
+                        }
                     }
                 }
                 false