[Fontconfig] fontconfig: Branch 'main'

[GitLab Mirror]

 src/fcfreetype.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a2044898854a1ab515e64d0a5aac78945adf8bb2
Author: Ben Wagner <bungeman at chromium.org>
Date:   Thu Oct 28 16:17:48 2021 -0400

    Fix warning about os2->achVendID cannot be NULL
    
    FreeType's TT_OS2::achVendID is a FT_Char[4] array and not a pointer,
    so it does not need to be checked for NULL.

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index ee86eb9..0a5743f 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -1370,7 +1370,7 @@ FcFreeTypeQueryFaceInternal (const FT_Face  face,
 
     if (os2 && os2->version >= 0x0001 && os2->version != 0xffff)
     {
-	if (os2->achVendID && os2->achVendID[0] != 0)
+	if (os2->achVendID[0] != 0)
 	{
 	    foundry_ = (FcChar8 *) malloc (sizeof (os2->achVendID) + 1);
 	    memcpy ((void *)foundry_, os2->achVendID, sizeof (os2->achVendID));