[WIN32SS][FONT] Check NULL of Face->style_name (#1113)
authorKatayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Tue, 11 Dec 2018 09:32:39 +0000 (18:32 +0900)
committerGitHub <noreply@github.com>
Tue, 11 Dec 2018 09:32:39 +0000 (18:32 +0900)
CORE-15433

win32ss/gdi/ntgdi/freetype.c

index fb823d4..744db67 100644 (file)
@@ -1095,7 +1095,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);