Zebediah Figura : gdi32: Do not compare face file names in insert_face_in_family_list() if either is NULL.

Alexandre Julliard julliard at winehq.org
Mon Jun 7 15:02:04 CDT 2021


Module: wine
Branch: stable
Commit: ae93bdd8fa743a319d858b44e26793861c7733ce
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=ae93bdd8fa743a319d858b44e26793861c7733ce

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Mon Jan 11 16:11:33 2021 -0600

gdi32: Do not compare face file names in insert_face_in_family_list() if either is NULL.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50486
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 96fdbabc722f95fd9c4051c1d6f73e5f9515afa3)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 dlls/gdi32/font.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index 7f243192cc3..6f50cc92a83 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -913,7 +913,7 @@ static BOOL insert_face_in_family_list( struct gdi_font_face *face, struct gdi_f
                    debugstr_w(face->full_name), debugstr_w(family->family_name),
                    cursor->version, face->version );
 
-            if (face->file && !wcsicmp( face->file, cursor->file ))
+            if (face->file && cursor->file && !wcsicmp( face->file, cursor->file ))
             {
                 cursor->refcount++;
                 TRACE("Font %s already in list, refcount now %d\n",




More information about the wine-cvs mailing list