Bug 381654. Initialize PangoAnalysis fields robustly. patch by Karl Tomlinson, r+sr=roc

This commit is contained in:
roc+@cs.cmu.edu 2007-06-06 20:29:34 -07:00
parent 0450fa102e
commit edbbba35fa

View File

@ -472,10 +472,12 @@ gfxPangoFont::GetCharSize(char aChar, gfxSize& aInkSize, gfxSize& aLogSize,
PRUint32 *aGlyphID)
{
PangoAnalysis analysis;
// Initialize new fields, gravity and flags in pango 1.16
// (or padding in 1.14).
// See bug #378700 for why we are using memset instead of { 0 }
// aggregate initialization.
memset(&analysis, 0, sizeof(analysis));
analysis.font = GetPangoFont();
analysis.level = 0;
analysis.lang_engine = nsnull;
analysis.extra_attrs = nsnull;
analysis.language = pango_language_from_string("en");
analysis.shape_engine = pango_font_find_shaper(analysis.font, analysis.language, aChar);