From 84c9da09e0cbf985789a5abd21b5f973176aa3ff Mon Sep 17 00:00:00 2001 From: mr-tz Date: Mon, 14 Oct 2024 05:27:38 +0000 Subject: [PATCH] fix save base address --- CHANGELOG.md | 2 ++ capa/ghidra/helpers.py | 2 +- capa/ida/helpers.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab5d9ca24..54fcd9e1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,12 +14,14 @@ - extractor: fix exception when PE extractor encounters unknown architecture #2440 @Tamir-K - IDA Pro: rename ida to idapro module for plugin and idalib in IDA 9.0 #2453 @mr-tz +- ghidra: fix saving of base address @mr-tz ### capa Explorer Web ### capa Explorer IDA Pro plugin - fix bug preventing saving of capa results via Save button @mr-tz +- fix saving of base address @mr-tz ### Development diff --git a/capa/ghidra/helpers.py b/capa/ghidra/helpers.py index b32c534a3..44af2f017 100644 --- a/capa/ghidra/helpers.py +++ b/capa/ghidra/helpers.py @@ -150,7 +150,7 @@ def collect_metadata(rules: List[Path]): os=os, extractor="ghidra", rules=tuple(r.resolve().absolute().as_posix() for r in rules), - base_address=capa.features.freeze.Address.from_capa(currentProgram().getImageBase().getOffset()), # type: ignore [name-defined] # noqa: F821 + base_address=capa.features.freeze.Address.from_capa(AbsoluteVirtualAddress(currentProgram().getImageBase().getOffset())), # type: ignore [name-defined] # noqa: F821 layout=rdoc.StaticLayout( functions=(), ), diff --git a/capa/ida/helpers.py b/capa/ida/helpers.py index 91f29f05e..066e8605d 100644 --- a/capa/ida/helpers.py +++ b/capa/ida/helpers.py @@ -204,7 +204,7 @@ def collect_metadata(rules: List[Path]): os=os, extractor="ida", rules=tuple(r.resolve().absolute().as_posix() for r in rules), - base_address=capa.features.freeze.Address.from_capa(idaapi.get_imagebase()), + base_address=capa.features.freeze.Address.from_capa(AbsoluteVirtualAddress(idaapi.get_imagebase())), layout=rdoc.StaticLayout( functions=(), # this is updated after capabilities have been collected.