gitea-mirror/capa
1
0
Fork 0
mirror of https://github.com/mandiant/capa.git synced 2025-12-12 15:49:46 -08:00
Code Issues Packages Projects Releases Wiki Activity

freeze: fix (de)serialization of tokens

Browse Source
This commit is contained in:
Willi Ballenthin
2022-06-10 14:46:56 -06:00
parent 6a5271c16f
commit 67221e5907
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
capa/features/freeze/__init__.py
View File

@@ -60,12 +60,10 @@ class Address(HashableModel):
return cls(type=AddressType.FILE, value=int(a))
elif isinstance(a, capa.features.address.DNTokenAddress):
# TODO: probably need serialization here
return cls(type=AddressType.DN_TOKEN, value=a.token)
return cls(type=AddressType.DN_TOKEN, value=a.token.value)
elif isinstance(a, capa.features.address.DNTokenOffsetAddress):
# TODO: probably need serialization here
return cls(type=AddressType.DN_TOKEN_OFFSET, value=(a.token, a.offset))
return cls(type=AddressType.DN_TOKEN_OFFSET, value=(a.token.value, a.offset))
elif a == capa.features.address.NO_ADDRESS or isinstance(a, capa.features.address._NoAddress):
return cls(type=AddressType.NO_ADDRESS, value=None)
@@ -90,10 +88,11 @@ class Address(HashableModel):
return capa.features.address.FileOffsetAddress(self.value)
elif self.type is AddressType.DN_TOKEN:
return capa.features.address.DNTokenAddress(self.value)
return capa.features.address.DNTokenAddress(dncil.clr.token.Token(self.value))
elif self.type is AddressType.DN_TOKEN_OFFSET:
return capa.features.address.DNTokenOffsetAddress(*self.value)
token, offset = self.value
return capa.features.address.DNTokenOffsetAddress(dncil.clr.token.Token(token), offset)
elif self.type is AddressType.NO_ADDRESS:
return capa.features.address.NO_ADDRESS