Skip to content

fix(w3d): guard against null bold font in W3DDisplayString::setFont #2893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bobtista wants to merge 3 commits into
base: main
Choose a base branch
from
+8 −2
Open

fix(w3d): guard against null bold font in W3DDisplayString::setFont #2893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91608dd
fix(w3d): guard against null bold font in W3DDisplayString::setFont
bobtista Jul 19, 2026
c99e3a8
fix(w3d): replicate null bold font guard to Generals
bobtista Jul 19, 2026
b3227a3
fix(w3d): Simplify null bold font guard
bobtista Jul 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayString.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,10 @@ void W3DDisplayString::setFont( GameFont *font )
// set the font in our renderer
m_textRenderer.Set_Font( static_cast<FontCharsClass *>(m_font->fontData) );

m_textRendererHotKey.Set_Font( static_cast<FontCharsClass *>(TheFontLibrary->getFont(font->nameString,font->pointSize, TRUE)->fontData) );
if( GameFont *boldFont = TheFontLibrary->getFont( font->nameString, font->pointSize, TRUE ) )
{
m_textRendererHotKey.Set_Font( static_cast<FontCharsClass *>(boldFont->fontData) );
}
// recompute extents for text with new font
computeExtents();

Expand Down
5 changes: 4 additions & 1 deletion GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayString.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,10 @@ void W3DDisplayString::setFont( GameFont *font )
// set the font in our renderer
m_textRenderer.Set_Font( static_cast<FontCharsClass *>(m_font->fontData) );

m_textRendererHotKey.Set_Font( static_cast<FontCharsClass *>(TheFontLibrary->getFont(font->nameString,font->pointSize, TRUE)->fontData) );
if( GameFont *boldFont = TheFontLibrary->getFont( font->nameString, font->pointSize, TRUE ) )
{
m_textRendererHotKey.Set_Font( static_cast<FontCharsClass *>(boldFont->fontData) );
}
// recompute extents for text with new font
computeExtents();

Expand Down
Loading