fix(font): Prevent possibility of creating invalid fonts with zero size

Author: xezon

Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.cpp

@@ -1507,6 +1507,8 @@ FontCharsClass::Update_Current_Buffer (int char_width)
 void
 FontCharsClass::Create_GDI_Font (const char *font_name)
 {
+	WWASSERT(PointSize > 0);
+
 	HDC screen_dc = ::GetDC ((HWND)WW3D::Get_Window());
 
 	const char *fontToUseForGenerals = "Arial";

Generals/Code/GameEngine/Source/GameClient/GUI/GameFont.cpp

@@ -178,6 +178,13 @@ void FontLibrary::reset( void )
 //-------------------------------------------------------------------------------------------------
 GameFont *FontLibrary::getFont( AsciiString name, Int pointSize, Bool bold )
 {
+	// sanity check the size - anything over 100 is probably wrong. -MW
+	// TheSuperHackers @fix Now also no longer creates fonts with zero size.
+	if (pointSize < 1 || pointSize > 100)
+	{
+		return NULL;
+	}
+
 	GameFont *font;
 
 	// search for font in list

Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameFont.cpp

@@ -73,20 +73,13 @@
 //=============================================================================
 Bool W3DFontLibrary::loadFontData( GameFont *font )
 {
-	FontCharsClass *fontChar;
-
 	// sanity
 	if( font == NULL )
 		return FALSE;
 
-	if ((UnsignedInt)font->pointSize > 100)	//sanity check the size - anything over 100 is probably wrong. -MW
-		fontChar = NULL;
-	else
-	{	// get the font data from the asset manager
-		fontChar = WW3DAssetManager::
-									Get_Instance()->Get_FontChars( font->nameString.str(), font->pointSize,
-																								 font->bold ? true : false );
-	}
+	// get the font data from the asset manager
+	FontCharsClass *fontChar = WW3DAssetManager::Get_Instance()->Get_FontChars(
+		font->nameString.str(), font->pointSize, font->bold ? true : false );
 
 	if( fontChar == NULL )
 	{

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameFont.cpp

@@ -178,6 +178,13 @@ void FontLibrary::reset( void )
 //-------------------------------------------------------------------------------------------------
 GameFont *FontLibrary::getFont( AsciiString name, Int pointSize, Bool bold )
 {
+	// sanity check the size - anything over 100 is probably wrong. -MW
+	// TheSuperHackers @fix Now also no longer creates fonts with zero size.
+	if (pointSize < 1 || pointSize > 100)
+	{
+		return NULL;
+	}
+
 	GameFont *font;
 
 	// search for font in list

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameFont.cpp

@@ -73,20 +73,13 @@
 //=============================================================================
 Bool W3DFontLibrary::loadFontData( GameFont *font )
 {
-	FontCharsClass *fontChar;
-
 	// sanity
 	if( font == NULL )
 		return FALSE;
 
-	if ((UnsignedInt)font->pointSize > 100)	//sanity check the size - anything over 100 is probably wrong. -MW
-		fontChar = NULL;
-	else
-	{	// get the font data from the asset manager
-		fontChar = WW3DAssetManager::
-									Get_Instance()->Get_FontChars( font->nameString.str(), font->pointSize,
-																								 font->bold ? true : false );
-	}
+	// get the font data from the asset manager
+	FontCharsClass *fontChar = WW3DAssetManager::Get_Instance()->Get_FontChars(
+		font->nameString.str(), font->pointSize, font->bold ? true : false );
 
 	if( fontChar == NULL )
 	{