From e419cc246f5fbd0abec2213f48a32917f9c08e80 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Sat, 22 Dec 2007 23:19:08 +0000
Subject: [PATCH] - Had a look at sbarinfo.cpp and noticed a few places where
 it allocated   character arrays and never freed them. Those have been
 replaced with   uses of FString. (One of these was even an instance of a
 member variable   being set to point at a stack variable.)

SVN r622 (trunk)
---
 docs/rh-log.txt           |  6 ++++++
 src/g_shared/sbarinfo.cpp | 26 +++++++++++---------------
 src/g_shared/sbarinfo.h   |  4 ++--
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index cc8b6e22ec..1dd5501ad1 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,9 @@
+December 22, 2007
+- Had a look at sbarinfo.cpp and noticed a few places where it allocated
+  character arrays and never freed them. Those have been replaced with
+  uses of FString. (One of these was even an instance of a member variable
+  being set to point at a stack variable.)
+
 December 22, 2007 (Changes by Graf Zahl)
 - Added Karate Chris's teamdamage in MAPINFO submission.
 - Added Blzut3's second SBARINFO update.
diff --git a/src/g_shared/sbarinfo.cpp b/src/g_shared/sbarinfo.cpp
index 62db67c23e..69ddf88e77 100644
--- a/src/g_shared/sbarinfo.cpp
+++ b/src/g_shared/sbarinfo.cpp
@@ -737,20 +737,18 @@ int SBarInfo::newImage(const char* patchname)
 			return i;
 		}
 	}
-	char * name = new char[9];
-	memset(name, '\0', 9);
-	memcpy(name, patchname, 8);
-	this->Images.Push(name);
-	return this->Images.Size() - 1;
+	return this->Images.Push(patchname);
 }
 
 //converts a string into a tranlation.
 EColorRange SBarInfo::GetTranslation(char* translation)
 {
 	EColorRange returnVal = CR_UNTRANSLATED;
-	char* namedTranslation = new char[strlen(translation)+3]; //we must send in "[translation]"
-	sprintf(namedTranslation, "[%s]", translation);
-	if((returnVal = V_ParseFontColor((const BYTE*&) namedTranslation, CR_UNTRANSLATED, CR_UNTRANSLATED)) == CR_UNDEFINED)
+	FString namedTranslation; //we must send in "[translation]"
+	const BYTE *trans_ptr;
+	namedTranslation.Format("[%s]", translation);
+	trans_ptr = (const BYTE *)(&namedTranslation[0]);
+	if((returnVal = V_ParseFontColor(trans_ptr, CR_UNTRANSLATED, CR_UNTRANSLATED)) == CR_UNDEFINED)
 	{
 		SC_ScriptError("Missing definition for color %s.", translation);
 	}
@@ -783,9 +781,7 @@ void SBarInfoCommand::setString(const char* source, int strnum, int maxlength, b
 			return;
 		}
 	}
-	this->string[strnum] = new char[strlen(source) + 1];
-	memset(this->string[strnum], '\0', strlen(source) + 1);
-	memcpy(this->string[strnum], source, strlen(source));
+	string[strnum] = source;
 }
 
 SBarInfoCommand::SBarInfoCommand() //sets the default values for more predicable behavior
@@ -958,7 +954,7 @@ public:
 			oldHealth = 0;
 		}
 		mugshotHealth = -1;
-		lastPrefix = new char[4];
+		lastPrefix = "";
 		weaponGrin = false;
 		chainWiggle = 0;
 	}
@@ -1054,7 +1050,7 @@ public:
 	}
 private:
 	//code from doom_sbar.cpp but it should do fine.
-	void SetFace (FPlayerSkin *skin, char* defPrefix)
+	void SetFace (FPlayerSkin *skin, const char* defPrefix)
 	{
 		oldSkin = skin;
 		const char *nameptrs[ST_NUMFACES]; 
@@ -1297,7 +1293,7 @@ private:
 					bool xdth = false;
 					if(cmd.special2 != 0)
 						xdth = true;
-					SetFace(oldSkin, cmd.string[0]);
+					SetFace(oldSkin, cmd.string[0].GetChars());
 					DrawFace(cmd.special, xdth, cmd.x, cmd.y);
 					break;
 				}
@@ -1752,7 +1748,7 @@ private:
 	FImageCollection Faces;
 	FPlayerSkin *oldSkin;
 	FFont *drawingFont;
-	char* lastPrefix;
+	FString lastPrefix;
 	bool weaponGrin;
 	int faceTimer;
 	int faceIndex;
diff --git a/src/g_shared/sbarinfo.h b/src/g_shared/sbarinfo.h
index 6f9c6832a2..9d545c2fc3 100644
--- a/src/g_shared/sbarinfo.h
+++ b/src/g_shared/sbarinfo.h
@@ -23,7 +23,7 @@ struct SBarInfoCommand
 	int y;
 	int value;
 	int sprite;
-	char* string[2];
+	FString string[2];
 	FFont *font;
 	EColorRange translation;
 	SBarInfoBlock subBlock; //for type SBarInfo_CMD_GAMEMODE
@@ -33,7 +33,7 @@ struct SBarInfoCommand
 
 struct SBarInfo
 {
-	TArray<const char*> Images;
+	TArray<FString> Images;
 	SBarInfoBlock huds[6];
 	bool automapbar;
 	bool interpolateHealth;