fontconfig: Branch 'main' - 3 commits

[GitLab Mirror <gitlab-mirror@xxxxxxxxxxxxxxxxxxxxxx>]

 src/fcname.c |    2 ++
 src/fcxml.c  |    4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit be2a400e16b2757f2d40d2373a0c6086a4e32b2f
Merge: 70b60ca ab76582
Author: Akira TAGOH <akira@xxxxxxxxx>
Date:   Wed Jul 31 08:57:06 2024 +0000

    Merge branch 'fix-sast' into 'main'
    
    Fix some code found by SAST
    
    See merge request fontconfig/fontconfig!327

commit ab765827101787d49c0a66b23addc1f68f99a455
Author: Akira TAGOH <akira@xxxxxxxxx>
Date:   Wed Jul 31 17:37:53 2024 +0900

    Set FcTypeVoid if no valid types to convert

diff --git a/src/fcname.c b/src/fcname.c
index 566f0ef..b152bd9 100644
--- a/src/fcname.c
+++ b/src/fcname.c
@@ -406,6 +406,8 @@ FcNameConvert (FcType type, const char *object, FcChar8 *string)
 	    v.u.r = FcRangeCreateDouble (b, e);
 	break;
     default:
+	/* No valid type to convert */
+	v.type = FcTypeVoid;
 	break;
     }
     return v;
commit eaa335e7c4686c622f31e691f8a41fdf30ea42b3
Author: Akira TAGOH <akira@xxxxxxxxx>
Date:   Wed Jul 31 17:31:36 2024 +0900

    Fix a memory leak in _get_real_paths_from_prefix

diff --git a/src/fcxml.c b/src/fcxml.c
index 9fe0674..083fc1f 100644
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -1327,11 +1327,9 @@ _get_real_paths_from_prefix(FcConfigParse *parse, const FcChar8 *path, const FcC
 	    if (!p)
 		return NULL;
 	    parent = FcStrDirname (p);
+	    FcStrFree (p);
 	    if (!parent)
-	    {
-		free (p);
 		return NULL;
-	    }
 	}
     }
 #ifndef _WIN32