-Fixed Issue 12, there was a bug calculating the offset to the VS_VERSIONINFO structure that would manifest in some files
-Updated copyright string and contact info
git-svn-id: http://pefile.googlecode.com/svn/trunk@96 8842bc4e-7134-0410-8230-5dc5194fb5c1
diff --git a/pefile.py b/pefile.py
index cce9223..89c5a9b 100644
--- a/pefile.py
+++ b/pefile.py
@@ -12,7 +12,7 @@
Lots of packed malware attempt to abuse the format way beyond its standard use.
To the best of my knowledge most of the abuses are handled gracefully.
-Copyright (c) 2005-2010 Ero Carrera <ero@dkbza.org>
+Copyright (c) 2005-2011 Ero Carrera <ero.carrera@gmail.com>
All rights reserved.
@@ -23,7 +23,7 @@
__revision__ = "$LastChangedRevision$"
__author__ = 'Ero Carrera'
__version__ = '1.2.10-%d' % int( __revision__[21:-2] )
-__contact__ = 'ero@dkbza.org'
+__contact__ = 'ero.carrera@gmail.com'
import os
@@ -3279,8 +3279,7 @@
def dword_align(self, offset, base):
- offset += base
- return (offset+3) - ((offset+3)%4) - base
+ return ((offset+base+3) & 0xfffffffcL) - (base & 0xfffffffcL)
def parse_delay_import_directory(self, rva, size):
diff --git a/peutils.py b/peutils.py
index fc823d1..89a20c5 100644
--- a/peutils.py
+++ b/peutils.py
@@ -2,7 +2,7 @@
"""peutils, Portable Executable utilities module
-Copyright (c) 2005-2010 Ero Carrera <ero@dkbza.org>
+Copyright (c) 2005-2011 Ero Carrera <ero.carrera@gmail.com>
All rights reserved.
@@ -18,7 +18,7 @@
__author__ = 'Ero Carrera'
__version__ = pefile.__version__
-__contact__ = 'ero@dkbza.org'
+__contact__ = 'ero.carrera@gmail.com'
