From bb1afb3356e126563c9692930a7b9bd58aa09018 Mon Sep 17 00:00:00 2001 From: Willi Ballenthin Date: Tue, 28 Jun 2022 11:18:24 -0600 Subject: [PATCH] render: verbose: render metadata tokens correctly closes #1053 --- capa/render/verbose.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/capa/render/verbose.py b/capa/render/verbose.py index a8a99400..48733fe4 100644 --- a/capa/render/verbose.py +++ b/capa/render/verbose.py @@ -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: