From 5b8380d52eae55cba0adcc47d78a53c320d294ec Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 2 Nov 2013 10:23:56 -0700 Subject: Avoid memory leak when NULL path passed to FcStrBuildFilename Reported by parfait 1.3: Memory leak of pointer sset allocated with FcStrSetCreate() at line 933 of src/fcstr.c in function 'FcStrBuildFilename'. sset allocated at line 927 with FcStrSetCreate(). sset leaks when sset != NULL at line 932. Signed-off-by: Alan Coopersmith --- src/fcstr.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/fcstr.c b/src/fcstr.c index 57071724..024dae32 100644 --- 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)) -- cgit v1.2.3