core: bump to object 0.36

closes #207
williballenthin · Nov 1, 2024 · a6c972f · a6c972f
1 parent 7da2f47
commit a6c972f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -14,7 +14,7 @@ travis-ci = { repository = "https://github.com/williballenthin/lancelot", branch
 [dependencies]
 log = "0.4"
 goblin = { version = "0.6", features = ["std", "pe32"], default-features = false }
-object = "0.30"
+object = "0.36"
 zydis = { features = ["wasm", "serialization"], optional = true, version = "3.1.3" }
 byteorder = "1"
 bitflags = "1"

diff --git a/core/src/loader/coff/mod.rs b/core/src/loader/coff/mod.rs
@@ -290,7 +290,6 @@ fn get_coff_symbols(obj: &object::File, module: &Module) -> Symbols {
                 name: name.to_string(),
                 kind: match symbol.kind() {
                     object::SymbolKind::Unknown => SymbolKind::Unknown,
-                    object::SymbolKind::Null => SymbolKind::Null,
                     object::SymbolKind::Text => SymbolKind::Text,
                     object::SymbolKind::Data => SymbolKind::Data,
                     object::SymbolKind::Section => SymbolKind::Section,
@@ -645,9 +644,13 @@ fn get_coff_fixups(
                     // this makes me think there might be a bug lurking around.
                     target + reloc.addend()
                 }
-                (object::RelocationKind::Coff(typ), _) => {
-                    warn!("coff: reloc: unsupported kind: COFF({:?})", typ);
-                    continue;
+                (object::RelocationKind::Unknown, _) => {
+                    if let object::RelocationFlags::Coff { typ } = reloc.flags() {
+                        warn!("coff: reloc: unsupported kind: COFF({:?})", typ);
+                        continue;
+                    } else {
+                        unimplemented!("relocation kind: {:?}", reloc.kind());
+                    }
                 }
                 _ => unimplemented!("relocation kind: {:?}", reloc.kind()),
             };