diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 58658684652..a85158f4e15 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -910,7 +910,8 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, Status = RtlAnsiStringToUnicodeString(&Entry->FaceName, &AnsiString, TRUE); if (NT_SUCCESS(Status)) { - if (Face->style_name[0] && strcmp(Face->style_name, "Regular")) + if (Face->style_name && Face->style_name[0] && + strcmp(Face->style_name, "Regular") != 0) { RtlInitAnsiString(&AnsiString, Face->style_name); Status = RtlAnsiStringToUnicodeString(&Entry->StyleName, &AnsiString, TRUE); @@ -4057,7 +4058,6 @@ GetFontPenalty(const LOGFONTW * LogFont, ASSERT(Otm); ASSERT(LogFont); - ASSERT(style_name); /* FIXME: Aspect Penalty 30 */ /* FIXME: IntSizeSynth Penalty 20 */