hacktools 0.40.0__tar.gz → 0.40.1__tar.gz

{hacktools-0.40.0/hacktools.egg-info → hacktools-0.40.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hacktools
-Version: 0.40.0
+Version: 0.40.1
 Summary: A set of utilities and tools for rom hacking and translations.
 Home-page: https://github.com/Illidanz/hacktools
 Author: Illidan

hacktools-0.40.1/hacktools/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.40.1"

{hacktools-0.40.0 → hacktools-0.40.1}/hacktools/common.py

@@ -1061,7 +1061,7 @@ class BinaryPointer:
         self.str = str
 
 
-def repackBinaryStrings(section, infile, outfile, binranges, freeranges=None, readfunc=detectEncodedString, writefunc=writeEncodedString, encoding="shift_jis", pointerstart=0, injectstart=0, fallbackf=None, injectfallback=0, sectionname="bin", preformat=None, postformat=None):
+def repackBinaryStrings(section, infile, outfile, binranges, freeranges=None, readfunc=detectEncodedString, writefunc=writeEncodedString, encoding="shift_jis", pointerstart=0, injectstart=0, fallbackf=None, injectfallback=0, sectionname="bin", preformat=None, postformat=None, pointeralign=1):
     insize = os.path.getsize(infile)
     notfound = []
     with Stream(infile, "rb") as fi:
@@ -1158,6 +1158,11 @@ def repackBinaryStrings(section, infile, outfile, binranges, freeranges=None, re
                                             index = allbin.find(pointersearch, index)
                                             if index < 0:
                                                 break
+                                            # Skip matches that aren't aligned: the pattern can collide with
+                                            # bytes inside code/data, and overwriting those corrupts the binary
+                                            if pointeralign > 1 and index % pointeralign != 0:
+                                                index += 1
+                                                continue
                                             foundone = True
                                             logDebug("Replaced pointer at", toHex(pointerstart + index), "with", toHex(newpointer))
                                             fo.seek(index)

{hacktools-0.40.0 → hacktools-0.40.1/hacktools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hacktools
-Version: 0.40.0
+Version: 0.40.1
 Summary: A set of utilities and tools for rom hacking and translations.
 Home-page: https://github.com/Illidanz/hacktools
 Author: Illidan

hacktools-0.40.0/hacktools/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.40.0"