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: address: fix .NET address sorting

Browse Source
This commit is contained in:
William Ballenthin
2022-06-08 13:07:10 -06:00
parent ad153499a3
commit c6144a1dfa
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,7 @@ import logging
from enum import Enum
from typing import Any, List, Tuple
import dncil.clr.token
from pydantic import Field, BaseModel
import capa.helpers
@@ -107,8 +108,15 @@ class Address(HashableModel):
if self.type in (AddressType.ABSOLUTE, AddressType.RELATIVE, AddressType.FILE):
return self.value < other.value
elif self.type in AddressType.DN_TOKEN:
assert isinstance(self.value, dncil.clr.token.Token)
return self.value.value < other.value.value
elif self.type in (AddressType.DN_TOKEN, AddressType.DN_TOKEN_OFFSET):
return self.value < other.value
assert isinstance(self.value[0], dncil.clr.token.Token)
a = (self.value[0].value, self.value[1])
b = (other.value[0].value, other.value[1])
return a < b
elif self.type is AddressType.NO_ADDRESS:
return True