зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1460543 - Check for null (default) style parameter in gfxDWriteFontEntry::CreateFontFace before dereferencing it. r=jwatt
This commit is contained in:
Родитель
9520a60bbd
Коммит
47a41be37b
|
@ -783,9 +783,10 @@ gfxDWriteFontEntry::CreateFontFace(IDWriteFontFace **aFontFace,
|
||||||
AutoTArray<DWRITE_FONT_AXIS_VALUE, 4> fontAxisValues;
|
AutoTArray<DWRITE_FONT_AXIS_VALUE, 4> fontAxisValues;
|
||||||
|
|
||||||
// Get the variation settings needed to instantiate the fontEntry
|
// Get the variation settings needed to instantiate the fontEntry
|
||||||
// for a particular fontStyle.
|
// for a particular fontStyle, or use default style if no aFontStyle
|
||||||
|
// was passed (e.g. instantiating a face just to read font tables).
|
||||||
AutoTArray<gfxFontVariation,4> vars;
|
AutoTArray<gfxFontVariation,4> vars;
|
||||||
GetVariationsForStyle(vars, *aFontStyle);
|
GetVariationsForStyle(vars, aFontStyle ? *aFontStyle : gfxFontStyle());
|
||||||
|
|
||||||
// Copy variation settings to DWrite's type.
|
// Copy variation settings to DWrite's type.
|
||||||
if (!vars.IsEmpty()) {
|
if (!vars.IsEmpty()) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче