Merge branch 'master' into web-add-releases-workflow

mandiant · Oct 22, 2024 · 13b1e53 · 13b1e53
2 parents 54badc3 + d74225b
commit 13b1e53
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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.

diff --git a/rules b/rules