gitea-mirror/capa
1
0
Fork 0
mirror of https://github.com/mandiant/capa.git synced 2026-02-04 19:12:01 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1069 from mandiant/fix-1053

Browse Source 
render: verbose: render metadata tokens correctly
This commit is contained in:
Willi Ballenthin
2022-06-28 11:30:48 -06:00
committed by GitHub
parent b2507d14c0 bb1afb3356
commit 5a73a8d7bb
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
capa/render/verbose.py
View File

@@ -44,15 +44,11 @@ def format_address(address: frz.Address) -> str:
return f"file+{rutils.hex(address.value)}"
elif address.type == frz.AddressType.DN_TOKEN:
token = dncil.clr.token.Token(address.value)
name = dnfile.mdtable.ClrMetaDataTableFactory._table_number_map[token.table].name
rid = token.rid
return f"{name}[{rid}]"
return f"token({rutils.hex(token.value)})"
elif address.type == frz.AddressType.DN_TOKEN_OFFSET:
token, offset = address.value
token = dncil.clr.token.Token(token)
name = dnfile.mdtable.ClrMetaDataTableFactory._table_number_map[token.table].name
rid = token.rid
return f"{name}[{rid}]+{rutils.hex(offset)}"
return f"token({rutils.hex(token.value)})+{rutils.hex(offset)}"
elif address.type == frz.AddressType.NO_ADDRESS:
return "global"
else: