From bc8fac5c3e216a150e292c3417adb9eb66829158 Mon Sep 17 00:00:00 2001
From: Sevenfm <Sevenfm@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Tue, 25 Jan 2022 11:25:03 +0000
Subject: [PATCH] Fix: memset bugs (by Asdow).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9275 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Strategic/MilitiaIndividual.cpp | 3 ++-
 Strategic/XML_FacilityTypes.cpp | 6 +-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Strategic/MilitiaIndividual.cpp b/Strategic/MilitiaIndividual.cpp
index 7552ebf72..dade1619c 100644
--- a/Strategic/MilitiaIndividual.cpp
+++ b/Strategic/MilitiaIndividual.cpp
@@ -27,7 +27,8 @@ std::vector<MILITIA> gIndividualMilitiaVector;
 
 MILITIA::MILITIA()
 {
-	memset( this, 0, sizeof(MILITIA) );
+	memset( this, 0, sizeof(SIZEOF_MILITIA_POD) );
+	this->history.clear();
 }
 
 BOOLEAN
diff --git a/Strategic/XML_FacilityTypes.cpp b/Strategic/XML_FacilityTypes.cpp
index 5d7561750..2605a7d50 100644
--- a/Strategic/XML_FacilityTypes.cpp
+++ b/Strategic/XML_FacilityTypes.cpp
@@ -58,8 +58,7 @@ struct
 	UINT32			curIndex;
 	UINT32			currentDepth;
 	UINT32			maxReadDepth;
-}
-typedef facilitytypeParseData;
+} typedef facilitytypeParseData;
 
 BOOLEAN FacilityTypes_TextOnly;
 
@@ -173,8 +172,6 @@ facilitytypeStartElementHandle(void *userData, const XML_Char *name, const XML_C
 		{
 			pData->curElement = FACILITYTYPE_TYPE;
 
-			memset( &pData->curFacilityTypeData, 0, sizeof(FACILITYTYPE) );
-
 			// Set all values to default before applying XML data
 			InitFacilityTypeEntry( pData );
 
@@ -1306,7 +1303,6 @@ BOOLEAN ReadInFacilityTypes(STR fileName, BOOLEAN localizedVersion)
 	XML_SetCharacterDataHandler(parser, facilitytypeCharacterDataHandle);
 
 
-	memset(&pData,0,sizeof(pData));
 	pData.maxArraySize = MAXITEMS;
 	pData.curIndex = 0;