Fixed some issues.

Rat431 · Oct 10, 2019 · 4adc957 · 4adc957
1 parent 167bfad
commit 4adc957
Show file tree

Hide file tree

Showing 32 changed files with 546 additions and 136 deletions.
diff --git a/src/CSteamCallbacks.cpp b/src/CSteamCallbacks.cpp
@@ -57,11 +57,11 @@ namespace SteamCallback
 	{
 		auto iter = CallbacksBuffer.begin();
 
-		// Loop untill we find the asked callback to remove based on the ID.
+		// Loop untill we find the asked callback to remove based on the callback itself.
 		while (iter != CallbacksBuffer.end())
 		{
 			CCallbackBase* handleriter = *iter;
-			if (handleriter && handleriter->GetICallback() == callback)
+			if (handleriter && handleriter == handler)
 			{
 				CallbacksBuffer.erase(iter);
 				break;

diff --git a/src/ColdManager.cpp b/src/ColdManager.cpp
@@ -45,10 +45,13 @@ namespace ColdAPI_DLC
 			{
 				if (ColdDLC_Config::DLCsCount > 0)
 				{
-					*pAppID = ColdDLC_Config::DLCsAPPID.at(iDLC);
-					*pbAvailable = true;
+					if(pAppID != NULL && pAppID > NULL)
+						*pAppID = ColdDLC_Config::DLCsAPPID.at(iDLC);
+					if(pbAvailable != NULL && pbAvailable > NULL)
+						*pbAvailable = true;
 					std::string Name = ColdDLC_Config::DLCsNames.at(iDLC);
-					std::memcpy(pchName, Name.c_str(), cchNameBufferSize);
+					if(pchName != NULL && pchName > NULL && cchNameBufferSize >= NULL)
+						std::memcpy(pchName, Name.c_str(), cchNameBufferSize);
 					return true;
 				}
 			}

diff --git a/src/INI example/ColdAPI.ini b/src/INI example/ColdAPI.ini
@@ -1,5 +1,5 @@
 [SteamProfile]
-Username = ColdAPI
+Username = Rat431
 LowViolence = 0
 Language = english
 ;------------------------

diff --git a/src/InterfacesEmulation/SteamAppTicket001.h b/src/InterfacesEmulation/SteamAppTicket001.h
@@ -19,13 +19,20 @@ class SteamAppTicketIn001 : public ISteamAppTicket001
 				SLength--;
 				FSize = sizeof(uint32_t) + sizeof(uint64_t) + SLength;
 			}
-			std::memcpy(pvSignedTicket, &Steam_Config::AppId, sizeof(uint32_t));
-			std::memcpy((void*)((ULONG_PTR)pvSignedTicket + sizeof(uint32_t)), &Steam_Config::UserID, sizeof(uint64_t));
-			std::memcpy((void*)((ULONG_PTR)pvSignedTicket + sizeof(uint32_t) + sizeof(uint64_t)), Signature, SLength);
-			*piAppId = 0;
-			*piSteamId = sizeof(uint32_t);
-			*piSignature = sizeof(uint32_t) + sizeof(uint64_t);
-			*pcbSignature = SLength;
+			if (pvSignedTicket != NULL && pvSignedTicket > NULL)
+			{
+				std::memcpy(pvSignedTicket, &Steam_Config::AppId, sizeof(uint32_t));
+				std::memcpy((void*)((ULONG_PTR)pvSignedTicket + sizeof(uint32_t)), &Steam_Config::UserID, sizeof(uint64_t));
+				std::memcpy((void*)((ULONG_PTR)pvSignedTicket + sizeof(uint32_t) + sizeof(uint64_t)), Signature, SLength);
+			}
+			if(piAppId != NULL && piAppId > NULL)
+				*piAppId = 0;
+			if(piSteamId != NULL && piSteamId > NULL)
+				*piSteamId = sizeof(uint32_t);
+			if(piSignature != NULL && piSignature > NULL)
+				*piSignature = sizeof(uint32_t) + sizeof(uint64_t);
+			if(pcbSignature != NULL && pcbSignature > NULL)
+				*pcbSignature = SLength;
 			return FSize;
 		}
 		return NULL;

diff --git a/src/InterfacesEmulation/SteamApps005.h b/src/InterfacesEmulation/SteamApps005.h
@@ -88,8 +88,11 @@ class SteamAppsIn005 : public ISteamApps005
 
 	uint32 GetAppInstallDir(AppId_t appID, char* pchFolder, uint32 cchFolderBufferSize)
 	{
-		GetCurrentDirectoryA(cchFolderBufferSize, pchFolder);
-		return cchFolderBufferSize;
+		if (pchFolder != NULL && pchFolder > NULL && cchFolderBufferSize >= NULL) {
+			GetCurrentDirectoryA(cchFolderBufferSize, pchFolder);
+			return cchFolderBufferSize;
+		}
+		return NULL;
 	}
 	bool BIsAppInstalled(AppId_t appID)
 	{

diff --git a/src/InterfacesEmulation/SteamApps006.h b/src/InterfacesEmulation/SteamApps006.h
@@ -88,8 +88,11 @@ class SteamAppsIn006 : public ISteamApps006
 
 	uint32 GetAppInstallDir(AppId_t appID, char* pchFolder, uint32 cchFolderBufferSize)
 	{
-		GetCurrentDirectoryA(cchFolderBufferSize, pchFolder);
-		return cchFolderBufferSize;
+		if (pchFolder != NULL && pchFolder > NULL && cchFolderBufferSize >= NULL) {
+			GetCurrentDirectoryA(cchFolderBufferSize, pchFolder);
+			return cchFolderBufferSize;
+		}
+		return NULL;
 	}
 	bool BIsAppInstalled(AppId_t appID)
 	{

diff --git a/src/InterfacesEmulation/SteamApps007.h b/src/InterfacesEmulation/SteamApps007.h
@@ -88,8 +88,11 @@ class SteamAppsIn007 : public ISteamApps007
 
 	uint32 GetAppInstallDir(AppId_t appID, char* pchFolder, uint32 cchFolderBufferSize)
 	{
-		GetCurrentDirectoryA(cchFolderBufferSize, pchFolder);
-		return cchFolderBufferSize;
+		if (pchFolder != NULL && pchFolder > NULL && cchFolderBufferSize >= NULL) {
+			GetCurrentDirectoryA(cchFolderBufferSize, pchFolder);
+			return cchFolderBufferSize;
+		}
+		return NULL;
 	}
 	bool BIsAppInstalled(AppId_t appID)
 	{

diff --git a/src/InterfacesEmulation/SteamApps008.h b/src/InterfacesEmulation/SteamApps008.h
@@ -89,8 +89,11 @@ class SteamAppsIn008 : public ISteamApps008
 
 	uint32 GetAppInstallDir(AppId_t appID, char* pchFolder, uint32 cchFolderBufferSize)
 	{
-		GetCurrentDirectoryA(cchFolderBufferSize, pchFolder);
-		return cchFolderBufferSize;
+		if (pchFolder != NULL && pchFolder > NULL && cchFolderBufferSize >= NULL) {
+			GetCurrentDirectoryA(cchFolderBufferSize, pchFolder);
+			return cchFolderBufferSize;
+		}
+		return NULL;
 	}
 	bool BIsAppInstalled(AppId_t appID)
 	{

diff --git a/src/InterfacesEmulation/SteamRemoteStorage001.h b/src/InterfacesEmulation/SteamRemoteStorage001.h
@@ -12,7 +12,7 @@ class SteamRemoteStorageIn001 : public ISteamRemoteStorage001
 			return true;
 		if (sizebytestowrite < NULL)
 			return false;
-		if(data == NULL)
+		if(data <= NULL)
 			return false;
 
 		// Let's use std as more faster.
@@ -48,6 +48,11 @@ class SteamRemoteStorageIn001 : public ISteamRemoteStorage001
 	{
 		if (!Steam_Config::RemoteStorage)
 			return false;
+		if(buffer <= NULL)
+			return false;
+		if(size < NULL)
+			return false;
+
 		// Let's use std as more faster.
 		std::FILE* File = std::fopen(ColdAPI_Storage::ConnectDirectoryToFile(filename), "rb");
 		if (File)
@@ -106,7 +111,8 @@ class SteamRemoteStorageIn001 : public ISteamRemoteStorage001
 				long FileSize = std::ftell(File);
 				std::fseek(File, 0, SEEK_SET);
 				std::fclose(File);
-				*size = FileSize;
+				if(size != NULL && size > NULL)
+					*size = FileSize;
 				return FileName.c_str();
 			}
 		}
@@ -115,6 +121,10 @@ class SteamRemoteStorageIn001 : public ISteamRemoteStorage001
 
 	bool GetQuota(int* current, int* maximum)
 	{
+		if (current == NULL || current < NULL)
+			return false;
+		if (maximum == NULL || maximum < NULL)
+			return false;
 		*current = NULL;
 		*maximum = INT_MAX;
 		return true;

diff --git a/src/InterfacesEmulation/SteamRemoteStorage002.h b/src/InterfacesEmulation/SteamRemoteStorage002.h
@@ -12,7 +12,7 @@ class SteamRemoteStorageIn002 : public ISteamRemoteStorage002
 			return true;
 		if (cubData < NULL)
 			return false;
-		if (pvData == NULL)
+		if (pvData <= NULL)
 			return false;
 
 		// Let's use std as more faster.
@@ -46,6 +46,11 @@ class SteamRemoteStorageIn002 : public ISteamRemoteStorage002
 	{
 		if (!Steam_Config::RemoteStorage)
 			return NULL;
+		if (cubDataToRead < NULL)
+			return NULL;
+		if (pvData <= NULL)
+			return NULL;
+
 		// Let's use std as more faster.
 		std::FILE* File = std::fopen(ColdAPI_Storage::ConnectDirectoryToFile(pchFile), "rb");
 		if (File)
@@ -94,7 +99,8 @@ class SteamRemoteStorageIn002 : public ISteamRemoteStorage002
 				long FileSize = std::ftell(File);
 				std::fseek(File, 0, SEEK_SET);
 				std::fclose(File);
-				*pnFileSizeInBytes = FileSize;
+				if(pnFileSizeInBytes != NULL && pnFileSizeInBytes > NULL)
+					*pnFileSizeInBytes = FileSize;
 				return FileName.c_str();
 			}
 		}
@@ -104,6 +110,10 @@ class SteamRemoteStorageIn002 : public ISteamRemoteStorage002
 
 	bool GetQuota(int32* pnTotalBytes, int32* puAvailableBytes)
 	{
+		if (pnTotalBytes == NULL || pnTotalBytes < NULL)
+			return false;
+		if (puAvailableBytes == NULL || puAvailableBytes < NULL)
+			return false;
 		*pnTotalBytes = NULL;
 		*puAvailableBytes = INT_MAX;
 		return true;

diff --git a/src/InterfacesEmulation/SteamRemoteStorage003.h b/src/InterfacesEmulation/SteamRemoteStorage003.h
@@ -12,7 +12,7 @@ class SteamRemoteStorageIn003 : public ISteamRemoteStorage003
 			return true;
 		if (cubData < NULL)
 			return false;
-		if (pvData == NULL)
+		if (pvData <= NULL)
 			return false;
 
 		// Let's use std as more faster.
@@ -29,6 +29,11 @@ class SteamRemoteStorageIn003 : public ISteamRemoteStorage003
 	{
 		if (!Steam_Config::RemoteStorage)
 			return NULL;
+		if (cubDataToRead < NULL)
+			return NULL;
+		if (pvData <= NULL)
+			return NULL;
+
 		// Let's use std as more faster.
 		std::FILE* File = std::fopen(ColdAPI_Storage::ConnectDirectoryToFile(pchFile), "rb");
 		if (File)
@@ -124,7 +129,8 @@ class SteamRemoteStorageIn003 : public ISteamRemoteStorage003
 				long FileSize = std::ftell(File);
 				std::fseek(File, 0, SEEK_SET);
 				std::fclose(File);
-				*pnFileSizeInBytes = FileSize;
+				if(pnFileSizeInBytes != NULL || pnFileSizeInBytes > NULL)
+					*pnFileSizeInBytes = FileSize;
 				return FileName.c_str();
 			}
 		}
@@ -134,6 +140,10 @@ class SteamRemoteStorageIn003 : public ISteamRemoteStorage003
 
 	bool GetQuota(int32* pnTotalBytes, int32* puAvailableBytes)
 	{
+		if (pnTotalBytes == NULL || pnTotalBytes < NULL)
+			return false;
+		if (puAvailableBytes == NULL || puAvailableBytes < NULL)
+			return false;
 		*pnTotalBytes = NULL;
 		*puAvailableBytes = INT_MAX;
 		return true;
@@ -202,11 +212,16 @@ class SteamRemoteStorageIn003 : public ISteamRemoteStorage003
 				long FileSize = std::ftell(File);
 				std::fseek(File, 0, SEEK_SET);
 				std::fclose(File);
-				*pnAppID = Steam_Config::AppId;
-				*ppchName = (char*)std::malloc(std::strlen(FileName.c_str()) + 10);
-				std::strcpy(*ppchName, FileName.c_str());
-				*pnFileSizeInBytes = FileSize;
-				*pSteamIDOwner = Steam_Config::UserID;
+				if(pnAppID != NULL && pnAppID > NULL)
+					*pnAppID = Steam_Config::AppId;
+				if (ppchName != NULL && ppchName > NULL) {
+					*ppchName = (char*)std::malloc(std::strlen(FileName.c_str()) + 10);
+					std::strcpy(*ppchName, FileName.c_str());
+				}
+				if(pnFileSizeInBytes != NULL && pnFileSizeInBytes > NULL)
+					*pnFileSizeInBytes = FileSize;
+				if(pSteamIDOwner != NULL && pSteamIDOwner > NULL)
+					*pSteamIDOwner = Steam_Config::UserID;
 				return true;
 			}
 		}
@@ -216,6 +231,10 @@ class SteamRemoteStorageIn003 : public ISteamRemoteStorage003
 	{
 		if (!Steam_Config::RemoteStorage)
 			return NULL;
+		if (cubDataToRead < NULL)
+			return NULL;
+		if (pvData <= NULL)
+			return NULL;
 
 		ColdAPI_Storage::FillFileStructure(ColdAPI_Storage::GetUGCDirectory());
 

diff --git a/src/InterfacesEmulation/SteamRemoteStorage004.h b/src/InterfacesEmulation/SteamRemoteStorage004.h
@@ -12,7 +12,7 @@ class SteamRemoteStorageIn004 : public ISteamRemoteStorage004
 			return true;
 		if (cubData < NULL)
 			return false;
-		if (pvData == NULL)
+		if (pvData <= NULL)
 			return false;
 
 		// Let's use std as more faster.
@@ -29,6 +29,11 @@ class SteamRemoteStorageIn004 : public ISteamRemoteStorage004
 	{
 		if (!Steam_Config::RemoteStorage)
 			return NULL;
+		if (cubDataToRead < NULL)
+			return NULL;
+		if (pvData <= NULL)
+			return NULL;
+
 		// Let's use std as more faster.
 		std::FILE* File = std::fopen(ColdAPI_Storage::ConnectDirectoryToFile(pchFile), "rb");
 		if (File)
@@ -131,7 +136,8 @@ class SteamRemoteStorageIn004 : public ISteamRemoteStorage004
 				long FileSize = std::ftell(File);
 				std::fseek(File, 0, SEEK_SET);
 				std::fclose(File);
-				*pnFileSizeInBytes = FileSize;
+				if(pnFileSizeInBytes != NULL && pnFileSizeInBytes > NULL)
+					*pnFileSizeInBytes = FileSize;
 				return FileName.c_str();
 			}
 		}
@@ -140,6 +146,10 @@ class SteamRemoteStorageIn004 : public ISteamRemoteStorage004
 
 	bool GetQuota(int32* pnTotalBytes, int32* puAvailableBytes)
 	{
+		if (pnTotalBytes == NULL || pnTotalBytes < NULL)
+			return false;
+		if (puAvailableBytes == NULL || puAvailableBytes < NULL)
+			return false;
 		*pnTotalBytes = NULL;
 		*puAvailableBytes = INT_MAX;
 		return true;
@@ -208,11 +218,16 @@ class SteamRemoteStorageIn004 : public ISteamRemoteStorage004
 				long FileSize = std::ftell(File);
 				std::fseek(File, 0, SEEK_SET);
 				std::fclose(File);
-				*pnAppID = Steam_Config::AppId;
-				*ppchName = (char*)std::malloc(std::strlen(FileName.c_str()) + 10);
-				std::strcpy(*ppchName, FileName.c_str());
-				*pnFileSizeInBytes = FileSize;
-				*pSteamIDOwner = Steam_Config::UserID;
+				if (pnAppID != NULL && pnAppID > NULL)
+					* pnAppID = Steam_Config::AppId;
+				if (ppchName != NULL && ppchName > NULL) {
+					*ppchName = (char*)std::malloc(std::strlen(FileName.c_str()) + 10);
+					std::strcpy(*ppchName, FileName.c_str());
+				}
+				if (pnFileSizeInBytes != NULL && pnFileSizeInBytes > NULL)
+					*pnFileSizeInBytes = FileSize;
+				if (pSteamIDOwner != NULL && pSteamIDOwner > NULL)
+					*pSteamIDOwner = Steam_Config::UserID;
 				return true;
 			}
 		}
@@ -222,6 +237,10 @@ class SteamRemoteStorageIn004 : public ISteamRemoteStorage004
 	{
 		if (!Steam_Config::RemoteStorage)
 			return NULL;
+		if (cubDataToRead < NULL)
+			return NULL;
+		if (pvData <= NULL)
+			return NULL;
 
 		ColdAPI_Storage::FillFileStructure(ColdAPI_Storage::GetUGCDirectory());