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] 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.");