[Fontconfig] fontconfig: Branch 'master'

[GitLab Mirror]

 src/fcxml.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit fd3eebad741c0fdfce2a7e44f9b3ac8895b70a58
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Mar 31 22:11:31 2021 +0200

    Fix potential memory leak in _get_real_paths_from_prefix

diff --git a/src/fcxml.c b/src/fcxml.c
index 0db318c..83019c0 100644
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -1299,12 +1299,17 @@ _get_real_paths_from_prefix(FcConfigParse *parse, const FcChar8 *path, const FcC
 	if (FcStrCmp (prefix, (const FcChar8 *) "xdg") == 0)
 	{
 	    parent = FcConfigXdgDataHome ();
-	    e = FcConfigXdgDataDirs ();
-	    if (!parent || !e)
+	    if (!parent)
 	    {
 		/* Home directory might be disabled */
 		return NULL;
 	    }
+	    e = FcConfigXdgDataDirs ();
+	    if (!e)
+	    {
+		FcStrFree (parent);
+		return NULL;
+	    }
 	}
 	else if (FcStrCmp (prefix, (const FcChar8 *) "default") == 0 ||
 		 FcStrCmp (prefix, (const FcChar8 *) "cwd") == 0)