From ea022de0223e4e9365a5ebe1370fe7df57c9a36e Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Sun, 21 Mar 2021 23:14:37 -0700 Subject: [PATCH] Fix a couple things: - Fix PECompact 2 version string - Fix UPX (NOS Variant) over-matching --- BurnOutSharp/PackerType/PECompact.cs | 4 ++-- BurnOutSharp/PackerType/UPX.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BurnOutSharp/PackerType/PECompact.cs b/BurnOutSharp/PackerType/PECompact.cs index b388651b..b294eb32 100644 --- a/BurnOutSharp/PackerType/PECompact.cs +++ b/BurnOutSharp/PackerType/PECompact.cs @@ -17,7 +17,7 @@ namespace BurnOutSharp.PackerType new Matcher(new byte?[] { 0x70, 0x65, 0x63, 0x31 }, "PE Compact 1"), // PEC2 - new Matcher(new byte?[] { 0x50, 0x45, 0x43, 0x32 }, GetVersion, "PE Compact 2 v"), + new Matcher(new byte?[] { 0x50, 0x45, 0x43, 0x32 }, GetVersion, "PE Compact 2"), // PECompact2 new Matcher(new byte?[] @@ -32,7 +32,7 @@ namespace BurnOutSharp.PackerType public static string GetVersion(string file, byte[] fileContent, int position) { - return BitConverter.ToInt16(fileContent, position + 4).ToString(); + return $"v{BitConverter.ToInt16(fileContent, position + 4)}"; } } } diff --git a/BurnOutSharp/PackerType/UPX.cs b/BurnOutSharp/PackerType/UPX.cs index 192f0db5..827fd36d 100644 --- a/BurnOutSharp/PackerType/UPX.cs +++ b/BurnOutSharp/PackerType/UPX.cs @@ -14,8 +14,8 @@ namespace BurnOutSharp.PackerType // UPX! new Matcher(new byte?[] { 0x55, 0x50, 0x58, 0x21 }, GetVersion, "Inno Setup"), - // NOS - new Matcher(new byte?[] { 0x4E, 0x4F, 0x53 }, GetVersion, "UPX (NOS Variant)"), + // NOS + new Matcher(new byte?[] { 0x4E, 0x4F, 0x53, 0x20 }, GetVersion, "UPX (NOS Variant)"), new Matcher( new List