Red error, ensure residual actiondata is not read for RichLabel

src/client/Client.cpp

@@ -58,7 +58,8 @@ extern "C"
 Client::Client():
 	authUser(0, ""),
 	updateAvailable(false),
-	versionCheckRequest(NULL)
+	versionCheckRequest(NULL),
+	messageOfTheDay("")
 {
 	int i = 0;
 	for(i = 0; i < THUMB_CACHE_SIZE; i++)

src/interface/RichLabel.cpp

@@ -22,7 +22,8 @@ public:
 
 RichLabel::RichLabel(Point position, Point size, std::string labelText):
 	Component(position, size),
-	textSource(labelText)
+	textSource(labelText),
+	displayText("")
 {
 	updateRichText();
 }
@@ -35,114 +36,123 @@ RichLabel::~RichLabel()
 void RichLabel::updateRichText()
 {
 	regions.clear();
+	displayText = "";
 
-	enum State { ReadText, ReadData, ReadRegion, ReadDataStart };
+	if(textSource.length())
-	State state = ReadText;
-
-	int currentDataPos = 0;
-	char * currentData = new char[textSource.length()+1];
-
-	int finalTextPos = 0;
-	char * finalText = new char[textSource.length()+1];
-
-	int originalTextPos = 0;
-	char * originalText = new char[textSource.length()+1];
-	std::copy(textSource.begin(), textSource.end(), originalText);
-
-	int stackPos = -1;
-	RichTextRegion * regionsStack = new RichTextRegion[256];
-
-	try
-	{
-		while(originalText[originalTextPos])
 		{
-			char current = originalText[originalTextPos];
 
-			if(state == ReadText)
+		enum State { ReadText, ReadData, ReadRegion, ReadDataStart };
+		State state = ReadText;
+
+		int currentDataPos = 0;
+		char * currentData = new char[textSource.length()+1];
+		std::fill(currentData, currentData+textSource.length()+1, 0);
+
+		int finalTextPos = 0;
+		char * finalText = new char[textSource.length()+1];
+		std::fill(finalText, finalText+textSource.length()+1, 0);
+
+		int originalTextPos = 0;
+		char * originalText = new char[textSource.length()+1];
+		std::copy(textSource.begin(), textSource.end(), originalText);
+
+		int stackPos = -1;
+		RichTextRegion * regionsStack = new RichTextRegion[256];
+
+		try
+		{
+			while(originalText[originalTextPos])
 			{
-				if(current == '{')
+				char current = originalText[originalTextPos];
+
+				if(state == ReadText)
 				{
-					if(stackPos > 255)
+					if(current == '{')
-						throw RichTextParseException("Too many nested regions");
-					stackPos++;
-					regionsStack[stackPos].start = finalTextPos;
-					regionsStack[stackPos].finish = finalTextPos;
-					state = ReadRegion;
-				}
-				else if(current == '}')
-				{
-					if(stackPos >= 0)
 					{
-						currentData[currentDataPos] = 0;
+						if(stackPos > 255)
-						regionsStack[stackPos].actionData = std::string(currentData);
+							throw RichTextParseException("Too many nested regions");
-						regions.push_back(regionsStack[stackPos]);
+						stackPos++;
-						stackPos--;
+						regionsStack[stackPos].start = finalTextPos;
+						regionsStack[stackPos].finish = finalTextPos;
+						state = ReadRegion;
+					}
+					else if(current == '}')
+					{
+						if(stackPos >= 0)
+						{
+							currentData[currentDataPos] = 0;
+							regionsStack[stackPos].actionData = std::string(currentData);
+							regions.push_back(regionsStack[stackPos]);
+							stackPos--;
+						}
+						else
+						{
+							throw RichTextParseException("Unexpected '}'");
+						}
 					}
 					else
 					{
-						throw RichTextParseException("Unexpected '}'");
+						finalText[finalTextPos++] = current;
+						finalText[finalTextPos] = 0;
+						if(stackPos >= 0)
+						{
+							regionsStack[stackPos].finish = finalTextPos;
+						}
 					}
 				}
-				else
+				else if(state == ReadData)
+				{
+					if(current == '|')
+					{
+						state = ReadText;
+					}
+					else
+					{
+						currentData[currentDataPos++] = current;
+						currentData[currentDataPos] = 0;
+					}
+				}
+				else if(state == ReadDataStart)
+				{
+					if(current != ':')
+					{
+						throw RichTextParseException("Expected ':'");
+					}
+					state = ReadData;
+					currentDataPos = 0;
+				}
+				else if(state == ReadRegion)
 				{
-					finalText[finalTextPos++] = current;
 					if(stackPos >= 0)
 					{
-						regionsStack[stackPos].finish = finalTextPos;
+						regionsStack[stackPos].action = current;
+						state = ReadDataStart;
+					}
+					else
+					{
+						throw RichTextParseException();
 					}
 				}
-			}
+
-			else if(state == ReadData)
+				originalTextPos++;
-			{
-				if(current == '|')
-				{
-					state = ReadText;
-				}
-				else
-				{
-					currentData[currentDataPos++] = current;
-				}
-			}
-			else if(state == ReadDataStart)
-			{
-				if(current != ':')
-				{
-					throw RichTextParseException("Expected ':'");
-				}
-				state = ReadData;
-				currentDataPos = 0;
-			}
-			else if(state == ReadRegion)
-			{
-				if(stackPos >= 0)
-				{
-					regionsStack[stackPos].action = current;
-					state = ReadDataStart;
-				}
-				else
-				{
-					throw RichTextParseException();
-				}
 			}
 
-			originalTextPos++;
+			if(stackPos != -1)
+				throw RichTextParseException("Unclosed region");
+
+			finalText[finalTextPos] = 0;
+			displayText = std::string(finalText);
 		}
-
+		catch (const RichTextParseException & e)
-		if(stackPos != -1)
+		{
-			throw RichTextParseException("Unclosed region");
+			displayText = "\br[Parse exception: " + std::string(e.what()) + "]";
-
+			regions.clear();
-		finalText[finalTextPos] = 0;
+		}
-		displayText = std::string(finalText);
+		delete[] currentData;
+		delete[] finalText;
+		delete[] originalText;
+		delete[] regionsStack;
 	}
-	catch (const RichTextParseException & e)
-	{
-		displayText = "[Parse exception: " + std::string(e.what()) + "]";
-	}
-	delete[] currentData;
-	delete[] finalText;
-	delete[] originalText;
-	delete[] regionsStack;
-
 	TextPosition(displayText);
 }