Pattern Added, Check Ocurrences in Both Files

pinwhell · Jun 28, 2022 · 943ce66 · 943ce66
1 parent ac1d0ec
commit 943ce66
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 4 deletions.
diff --git a/FileAOBDiff/FileAOBDiff.cpp b/FileAOBDiff/FileAOBDiff.cpp
@@ -7,6 +7,9 @@
 #include <conio.h>
 #include "Pattern.h"
 #include "DiffHelper.h"
+#include "PatternEngine.h"
+#include <functional>
+#include <thread>
 
 
 FileAOBDiff::FileAOBDiff()
@@ -75,6 +78,26 @@ void FileAOBDiff::Run()
                     DiffHelper::MakeDiff(pFile1, pFile2, file1Off, file2Off, uint64_t(diffingSize), resultDiff);
 
                     std::cout << "Result: " << resultDiff.toString() << std::endl;
+                    std::vector<uintptr_t> resultDiffFile1Ocurrences;
+                    std::vector<uintptr_t> resultDiffFile2Ocurrences;
+
+                    std::thread t1([&] {
+                        PatternEngine::FindPattern(pFile1, resultDiff, resultDiffFile1Ocurrences);
+                    });
+
+                    std::thread t2([&] {
+                        PatternEngine::FindPattern(pFile2, resultDiff, resultDiffFile2Ocurrences);
+                    });
+
+                    t1.join();
+                    t2.join();
+
+                    if (resultDiffFile1Ocurrences.size() != resultDiffFile2Ocurrences.size())
+                    {
+                        std::cout << file1Name << ": " << resultDiffFile1Ocurrences.size() << " Ocurrences\n";
+                        std::cout << file2Name << ": " << resultDiffFile2Ocurrences.size() << " Ocurrences\n";
+                    }
+                    else std::cout << "Pattern Unique!\n";                    
                 }
                 else std::cout << "Invalid Offset\n";
             }

diff --git a/FileAOBDiff/FileAOBDiff.h b/FileAOBDiff/FileAOBDiff.h
@@ -1,14 +1,11 @@
 #pragma once
 
 class FilesEngine;
-class PatternEngine;
-
 
 class FileAOBDiff
 {
 private:
 	FilesEngine* pFilesEngine;
-	PatternEngine* pPatternEngine;
 
 public:
 	FileAOBDiff();

diff --git a/FileAOBDiff/FileAOBDiff.vcxproj b/FileAOBDiff/FileAOBDiff.vcxproj
@@ -102,6 +102,8 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -130,6 +132,8 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

diff --git a/FileAOBDiff/Pattern.cpp b/FileAOBDiff/Pattern.cpp
@@ -49,3 +49,13 @@ void Pattern::AddWildCard()
 {
 	AddByte(0x0, true);
 }
+
+std::vector<unsigned char> Pattern::getBytes() const
+{
+	std::vector<unsigned char> bytes;
+
+	for (const PatternByte& uc : aob)
+		bytes.push_back(uc.byteType == ByteType::BYTE ? uc.byte : '?');
+
+	return bytes;
+}
diff --git a/FileAOBDiff/Pattern.h b/FileAOBDiff/Pattern.h
@@ -20,5 +20,6 @@ struct Pattern
 	std::string toString();
 	void AddByte(unsigned char byte, bool bIsWildCard = false);
 	void AddWildCard();
+	std::vector<unsigned char> getBytes() const;
 };
 
diff --git a/FileAOBDiff/PatternEngine.cpp b/FileAOBDiff/PatternEngine.cpp
@@ -1 +1,32 @@
 #include "PatternEngine.h"
+#include "File.h"
+#include "Pattern.h"
+#include "Buffer.h"
+
+bool PatternEngine::CompareMem(const unsigned char* memChunk, const unsigned char* mask, const size_t len)
+{
+	for (size_t i = 0; i < len; i++)
+	{
+		if (mask[i] != memChunk[i] && mask[i] != '?')
+			return false;
+	}
+
+	return true;
+}
+
+void PatternEngine::FindPattern(const File* pFile, const Pattern& patternMask, std::vector<uintptr_t>& outResults)
+{
+	Buffer* pBuff = pFile->pBuff;
+	const auto patternMaskBuff = patternMask.getBytes();
+
+	if (pBuff) FindPattern(pBuff->mBuff, pBuff->mBuff + pBuff->mSize, patternMaskBuff.data(), patternMaskBuff.size(), outResults);
+}
+
+void PatternEngine::FindPattern(const unsigned char* pStartAddr, const unsigned char* pEndAddr, const unsigned char* pMask, size_t maskLen, std::vector<uintptr_t>& outResults)
+{
+	for (const unsigned char* pCurr = pStartAddr; (pCurr + maskLen) < pEndAddr; pCurr++)
+	{
+		if (CompareMem(pCurr, pMask, maskLen))
+			outResults.push_back((uintptr_t)(pStartAddr + (pEndAddr - pCurr)));
+	}
+}
diff --git a/FileAOBDiff/PatternEngine.h b/FileAOBDiff/PatternEngine.h
@@ -1,7 +1,15 @@
 #pragma once
 
+#include <vector>
+
+struct File;
+struct Pattern;
+
 class PatternEngine
 {
-
+public:
+	static bool CompareMem(const unsigned char* memChunk, const unsigned char* mask, const size_t len);
+	static void FindPattern(const File* pFile, const Pattern& pPatternMask, std::vector<uintptr_t>& outResults);
+	static void FindPattern(const unsigned char* pStartAddr, const unsigned char* pEndAddr, const unsigned char* pMask, size_t maskLen, std::vector<uintptr_t>& outResults);
 };