Fixed bug if the pattern isn't found

Ceiridge · May 29, 2020 · 73b9c01 · 73b9c01
1 parent cb6bef9
commit 73b9c01
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/ChromeDevExtWarningPatcher/DllPatcher.cs b/ChromeDevExtWarningPatcher/DllPatcher.cs
@@ -16,6 +16,7 @@ public bool Patch(BytePatchPattern.WriteToLog log) {
                 throw new IOException("File not found");
 
             byte[] raw = File.ReadAllBytes(dllFile.FullName);
+            log("Patching " + dllFile.FullName + "...");
 
             FileInfo dllFileBackup = new FileInfo(dllFile.FullName + ".bck");
             if (!dllFileBackup.Exists) {

diff --git a/ChromeDevExtWarningPatcher/Patches/BytePatchManager.cs b/ChromeDevExtWarningPatcher/Patches/BytePatchManager.cs
@@ -134,11 +134,11 @@ public bool PatchBytes(ref byte[] raw, bool x64, BytePatchPattern.WriteToLog log
                 byte patchOrigByte = x64 ? patch.origByteX64 : patch.origByteX86;
                 byte patchPatchByte = x64 ? patch.patchByteX64 : patch.patchByteX86;
 
-                if (patchOffset < searchPattern.Length && searchPattern[patchOffset] != 0xFF)
-                    patchOrigByte = searchPattern[patchOffset]; // The patterns can sometimes start at different places (yes, I'm looking at you, Edge), so the byte in the pattern should be always preferred
-
                 if (addr != -1) {
-                REDO_CHECKS:
+                    if (patchOffset < searchPattern.Length && searchPattern[patchOffset] != 0xFF)
+                        patchOrigByte = searchPattern[patchOffset]; // The patterns can sometimes start at different places (yes, I'm looking at you, Edge), so the byte in the pattern should be always preferred
+
+                    REDO_CHECKS:
                     long index = addr + patchOffset;
                     byte sourceByte = raw[index];