Avoid memory leak when NULL path passed to FcStrBuildFilename

[platform/upstream/fontconfig.git] / src / fcstr.c

diff --git a/src/fcstr.c b/src/fcstr.c
index 5707172..024dae3 100644 (file)
--- a/src/fcstr.c
+++ b/src/fcstr.c
@@ -924,12 +924,16 @@ FcStrBuildFilename (const FcChar8 *path,
                    ...)
 {
     va_list ap;
-    FcStrSet *sset = FcStrSetCreate ();
+    FcStrSet *sset;
     FcStrList *list;
     FcChar8 *s, *ret = NULL, *p;
     size_t len = 0;
 
-    if (!sset || !path)
+    if (!path)
+       return NULL;
+
+    sset = FcStrSetCreate ();
+    if (!sset)
        return NULL;
 
     if (!FcStrSetAdd (sset, path))