From 098486fbe4181a23c8970b943cbb3f99e5d3c0ff Mon Sep 17 00:00:00 2001
From: Alexander 'z33ky' Hirsch <1zeeky@gmail.com>
Date: Sun, 23 May 2021 12:11:12 +0200
Subject: [PATCH 1/2] Fix pointer comparisons

---
 sp/src/game/client/clientmode_shared.cpp | 2 +-
 sp/src/tier1/strtools.cpp                | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sp/src/game/client/clientmode_shared.cpp b/sp/src/game/client/clientmode_shared.cpp
index f68531bb..6f2aa4b8 100644
--- a/sp/src/game/client/clientmode_shared.cpp
+++ b/sp/src/game/client/clientmode_shared.cpp
@@ -1259,7 +1259,7 @@ void ClientModeShared::FireGameEvent( IGameEvent *event )
 			}
 		}
 
-		if ( team == 0 && GetLocalTeam() > 0 )
+		if ( team == 0 && GetLocalTeam() )
 		{
 			bValidTeam = false;
 		}
diff --git a/sp/src/tier1/strtools.cpp b/sp/src/tier1/strtools.cpp
index 9b1bfa84..62d31c15 100644
--- a/sp/src/tier1/strtools.cpp
+++ b/sp/src/tier1/strtools.cpp
@@ -1420,7 +1420,7 @@ int V_UCS2ToUnicode( const ucs2 *pUCS2, wchar_t *pUnicode, int cubDestSizeInByte
 	size_t nMaxUTF8 = cubDestSizeInBytes;
 	char *pIn = (char *)pUCS2;
 	char *pOut = (char *)pUnicode;
-	if ( conv_t > 0 )
+	if ( conv_t )
 	{
 		cchResult = 0;
 		cchResult = iconv( conv_t, &pIn, &nLenUnicde, &pOut, &nMaxUTF8 );
@@ -1461,7 +1461,7 @@ int V_UnicodeToUCS2( const wchar_t *pUnicode, int cubSrcInBytes, char *pUCS2, in
 	size_t nMaxUCS2 = cubDestSizeInBytes;
 	char *pIn = (char*)pUnicode;
 	char *pOut = pUCS2;
-	if ( conv_t > 0 )
+	if ( conv_t )
 	{
 		cchResult = 0;
 		cchResult = iconv( conv_t, &pIn, &nLenUnicde, &pOut, &nMaxUCS2 );
@@ -1508,7 +1508,7 @@ int V_UCS2ToUTF8( const ucs2 *pUCS2, char *pUTF8, int cubDestSizeInBytes )
 	size_t nMaxUTF8 = cubDestSizeInBytes - 1;
 	char *pIn = (char *)pUCS2;
 	char *pOut = (char *)pUTF8;
-	if ( conv_t > 0 )
+	if ( conv_t )
 	{
 		cchResult = 0;
 		const size_t nBytesToWrite = nMaxUTF8;
@@ -1554,7 +1554,7 @@ int V_UTF8ToUCS2( const char *pUTF8, int cubSrcInBytes, ucs2 *pUCS2, int cubDest
 	size_t nMaxUTF8 = cubDestSizeInBytes;
 	char *pIn = (char *)pUTF8;
 	char *pOut = (char *)pUCS2;
-	if ( conv_t > 0 )
+	if ( conv_t )
 	{
 		cchResult = 0;
 		cchResult = iconv( conv_t, &pIn, &nLenUnicde, &pOut, &nMaxUTF8 );

From 78ef9f2019983924b72fd66769712e2bf935128c Mon Sep 17 00:00:00 2001
From: Alexander 'z33ky' Hirsch <1zeeky@gmail.com>
Date: Sun, 23 May 2021 12:11:26 +0200
Subject: [PATCH 2/2] Fix MapEdit memory errors

deleteThis() was called on NULL pointers.
Deleting individual nodes shouldn't be necessary if the whole structure
(pkvFile) is deleted anyways.
---
 sp/src/game/shared/mapbase/MapEdit.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/sp/src/game/shared/mapbase/MapEdit.cpp b/sp/src/game/shared/mapbase/MapEdit.cpp
index 9ff1db60..0891c29e 100644
--- a/sp/src/game/shared/mapbase/MapEdit.cpp
+++ b/sp/src/game/shared/mapbase/MapEdit.cpp
@@ -409,7 +409,6 @@ public:
 
 					pkvClassname = pkvClassname->GetNextKey();
 				}
-				pkvClassname->deleteThis();
 			}
 			else if (FStrEq(pNodeName, "edit"))
 			{
@@ -432,7 +431,6 @@ public:
 
 					pName = pName->GetNextKey();
 				}
-				pName->deleteThis();
 			}
 			else if (FStrEq(pNodeName, "delete"))
 			{
@@ -455,7 +453,6 @@ public:
 
 					pName = pName->GetNextKey();
 				}
-				pName->deleteThis();
 			}
 			else if (FStrEq(pNodeName, "fire"))
 			{
@@ -525,12 +522,10 @@ public:
 
 					pkvNodeData = pkvNodeData->GetNextKey();
 				}
-				pkvNodeData->deleteThis();
 			}
 
 			pkvNode = pkvNode->GetNextKey();
 		}
-		pkvNode->deleteThis();
 	}
 
 	void SpawnMapEdit(const char *pFile = NULL)
@@ -889,8 +884,8 @@ void CC_MapEdit_Print( const CCommand& args )
 				pkvNode = pkvNode->GetNextKey();
 			}
 
-			pkvNode->deleteThis();
 		}
+		pkvFile->deleteThis();
 	}
 }
 static ConCommand mapedit_print("mapedit_print", CC_MapEdit_Print, "Prints a mapedit file in the console.");