Move LZSS exploit segfault fix hook to ExploitFixes.cpp (#195)

* Move LZSS exploit fix hook to ExploitFixes.cpp

* Formatting changes for clang-format

1 files changed, 1 insertions, 107 deletions

diff --git a/NorthstarDedicatedTest/miscserverfixes.cpp b/NorthstarDedicatedTest/miscserverfixes.cpp
index ddbfcfbb..e85950c4 100644
--- a/NorthstarDedicatedTest/miscserverfixes.cpp
+++ b/NorthstarDedicatedTest/miscserverfixes.cpp
@@ -23,110 +23,4 @@ void InitialiseMiscServerFixes(HMODULE baseAddress)
 	{
 		NSMem::BytePatch(ba + 0x153920, "C3");
 	}
-}
-
-typedef unsigned int(__fastcall* CLZSS__SafeUncompressType)(
-	void* self, const unsigned char* pInput, unsigned char* pOutput, unsigned int unBufSize);
-CLZSS__SafeUncompressType CLZSS__SafeUncompress;
-
-struct lzss_header_t
-{
-	unsigned int id;
-	unsigned int actualSize;
-};
-
-static constexpr int LZSS_LOOKSHIFT = 4;
-
-// Rewrite of CLZSS::SafeUncompress to fix a vulnerability where malicious compressed payloads could cause the decompressor to try to read
-// out of the bounds of the output buffer.
-static unsigned int CLZSS__SafeUncompressHook(void* self, const unsigned char* pInput, unsigned char* pOutput, unsigned int unBufSize)
-{
-	unsigned int totalBytes = 0;
-	int getCmdByte = 0;
-	int cmdByte = 0;
-
-	lzss_header_t header = *(lzss_header_t*)pInput;
-
-	if (pInput == NULL)
-	{
-		return 0;
-	}
-	if (header.id != 0x53535a4c)
-	{
-		return 0;
-	}
-	if (header.actualSize == 0)
-	{
-		return 0;
-	}
-	if (header.actualSize > unBufSize)
-	{
-		return 0;
-	}
-
-	pInput += sizeof(lzss_header_t);
-
-	for (;;)
-	{
-		if (!getCmdByte)
-		{
-			cmdByte = *pInput++;
-		}
-		getCmdByte = (getCmdByte + 1) & 0x07;
-
-		if (cmdByte & 0x01)
-		{
-			int position = *pInput++ << LZSS_LOOKSHIFT;
-			position |= (*pInput >> LZSS_LOOKSHIFT);
-			position += 1;
-			int count = (*pInput++ & 0x0F) + 1;
-			if (count == 1)
-			{
-				break;
-			}
-
-			// Ensure reference chunk exists entirely within our buffer
-			if (position > totalBytes)
-			{
-				return 0;
-			}
-
-			totalBytes += count;
-			if (totalBytes > unBufSize)
-			{
-				return 0;
-			}
-
-			unsigned char* pSource = pOutput - position;
-			for (int i = 0; i < count; i++)
-			{
-				*pOutput++ = *pSource++;
-			}
-		}
-		else
-		{
-			totalBytes++;
-			if (totalBytes > unBufSize)
-			{
-				return 0;
-			}
-			*pOutput++ = *pInput++;
-		}
-		cmdByte = cmdByte >> 1;
-	}
-
-	if (totalBytes != header.actualSize)
-	{
-		return 0;
-	}
-
-	return totalBytes;
-
-	return 0;
-}
-
-void InitialiseMiscEngineServerFixes(HMODULE baseAddress)
-{
-	HookEnabler hook;
-	ENABLER_CREATEHOOK(hook, (char*)baseAddress + 0x432a10, &CLZSS__SafeUncompressHook, reinterpret_cast<LPVOID*>(&CLZSS__SafeUncompress));
-}
+}
\ No newline at end of file