From 8e3a5f55b3ced01bf60383c3d7acc143d9960ab4 Mon Sep 17 00:00:00 2001 From: Elias Bachaalany Date: Thu, 4 May 2023 20:55:26 -0700 Subject: [PATCH] bugfix: idautils.peutils_t had duplicate definitions of the same function - renamed the `header` property to its proper name: `header_offset` - added more docstrings - minor mods --- python/idautils.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/python/idautils.py b/python/idautils.py index 09eaf84..45cd4d7 100644 --- a/python/idautils.py +++ b/python/idautils.py @@ -735,22 +735,17 @@ class peutils_t(object): self.__penode = ida_netnode.netnode() self.__penode.create(peutils_t.PE_NODE) - imagebase = property( - lambda self: self.__penode.altval(peutils_t.PE_ALT_IMAGEBASE) - ) + imagebase = property(lambda self: self.__penode.altval(peutils_t.PE_ALT_IMAGEBASE)) + """Loading address (usually pe.imagebase)""" - header = property( - lambda self: self.__penode.altval(peutils_t.PE_ALT_PEHDR_OFF) - ) + header_offset = property(lambda self: self.__penode.altval(peutils_t.PE_ALT_PEHDR_OFF)) + """Offset of PE header""" def __str__(self): - return "peutils_t(imagebase=%s, header=%s)" % (hex(self.imagebase), hex(self.header)) + return "peutils_t(imagebase=%x, header=%x)" % (self.imagebase, self.header_offset) - def header(self): - """ - Returns the complete PE header as an instance of peheader_t (defined in the SDK). - """ - return self.__penode.valobj() + header = lambda self: self.__penode.valobj() + """Returns the complete PE header as an instance of peheader_t (defined in the SDK).""" # ----------------------------------------------------------------------- cpu = _cpu()