fontconfig: Branch 'main'

[GitLab Mirror <gitlab-mirror@xxxxxxxxxxxxxxxxxxxxxx>]

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

New commits:
commit 2fb3419a92156569bc1ec707401258c922cd0d99
Author: Akira TAGOH <akira@xxxxxxxxx>
Date:   Thu Jul 27 16:11:07 2023 +0900

    Fix uninitialized memory access when failing memory allocation.
    
    FamilyTableInit() is called after allocating memory.
    but FamilyTableClear() may be called when the allocation is failed.
    
    Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/374
    
    Reported by Andreas Falkenhahn

diff --git a/src/fccfg.c b/src/fccfg.c
index 655bb99..41ee611 100644
--- a/src/fccfg.c
+++ b/src/fccfg.c
@@ -2275,8 +2275,8 @@ FcConfigSubstituteWithPat (FcConfig    *config,
 	printf ("FcConfigSubstitute done");
 	FcPatternPrint (p);
     }
-bail1:
     FamilyTableClear (&data);
+bail1:
     if (elt)
 	free (elt);
     if (value)