From b8a7feabea6456f7fa5e8403c8d9bd2630401045 Mon Sep 17 00:00:00 2001
From: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>
Date: Mon, 28 Mar 2022 23:48:05 +0200
Subject: More exploit fixes by KIttenPopo (#126)

* Quick fix for a bug I caused

* Typo

* Update kitten-fixes branch to my repo (#122)

* Added string hash macro

* Added convenient vtfunc macro

* Made lil ConCommand creation macro

* Fixed multiple NET_SetConVar exploits

* Quick fixerino

* Fix convar struct (and other things)

* Revive clang-format (but good, i think)

* Update .clang-format

* Reformatted code to meet .clang-format requirements

* Minor formatting fixes

* Fixed Northstar "crashing" when console is closed

* Update .clang-format

* Quick fix for a bug I caused

* Typo

* NSMem Update

* ExplotFixes: Only block excessive convar counts if server

* Update ExploitFixes.cpp

* Update ExploitFixes.cpp

* Updated bytepatch format

* reformatted all code for clang-format

* Updated my clang-format to v13.0.0

* 3 fixes in 1

- ANTITAMPER fixed
- NSMem simplification update
- Fixed bad byte string in serverauthentication.cpp

* Improved ExploitFixes logging and NET_SetConVar patch

* clang-format unironically sabotaged my code

* Made ns_exploitfixes_log on by default

* Fixed IsMemoryReadable (oops)

Co-authored-by: KittenPopo <Pokeberry123@gmail.com>
---
 LauncherInjector/main.cpp | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'LauncherInjector')

diff --git a/LauncherInjector/main.cpp b/LauncherInjector/main.cpp
index 54c65059..1e3310ff 100644
--- a/LauncherInjector/main.cpp
+++ b/LauncherInjector/main.cpp
@@ -295,21 +295,16 @@ int main(int argc, char* argv[])
 	{
 		printf("[*] Loading stubs\n");
 		HMODULE gssao, gtxaa, d3d11;
-		if (!(gssao = GetModuleHandleA("GFSDK_SSAO.win64.dll")) &&
-			!(gtxaa = GetModuleHandleA("GFSDK_TXAA.win64.dll")) &&
+		if (!(gssao = GetModuleHandleA("GFSDK_SSAO.win64.dll")) && !(gtxaa = GetModuleHandleA("GFSDK_TXAA.win64.dll")) &&
 			!(d3d11 = GetModuleHandleA("d3d11.dll")))
 		{
-			if (!(gssao = LoadDediStub("GFSDK_SSAO.win64.dll")) ||
-				!(gtxaa = LoadDediStub("GFSDK_TXAA.win64.dll")) ||
+			if (!(gssao = LoadDediStub("GFSDK_SSAO.win64.dll")) || !(gtxaa = LoadDediStub("GFSDK_TXAA.win64.dll")) ||
 				!(d3d11 = LoadDediStub("d3d11.dll")))
 			{
-				if ((!gssao || FreeLibrary(gssao)) &&
-					(!gtxaa || FreeLibrary(gtxaa)) &&
-					(!d3d11 || FreeLibrary(d3d11)))
+				if ((!gssao || FreeLibrary(gssao)) && (!gtxaa || FreeLibrary(gtxaa)) && (!d3d11 || FreeLibrary(d3d11)))
 				{
-					printf(
-						"[*] WARNING: Failed to load d3d11/gfsdk stubs from bin/x64_dedi. "
-						"The stubs have been unloaded and the original libraries will be used instead.\n");
+					printf("[*] WARNING: Failed to load d3d11/gfsdk stubs from bin/x64_dedi. "
+						   "The stubs have been unloaded and the original libraries will be used instead.\n");
 				}
 				else
 				{
@@ -326,9 +321,8 @@ int main(int argc, char* argv[])
 		else
 		{
 			// this should never happen
-			printf(
-				"[*] WARNING: Failed to load stubs because conflicting modules are already loaded, so those will be used instead "
-				"(did Northstar initialize too late?).\n");
+			printf("[*] WARNING: Failed to load stubs because conflicting modules are already loaded, so those will be used instead "
+				   "(did Northstar initialize too late?).\n");
 		}
 	}
 
-- 
cgit v1.2.3