commit bd7123ac416efd5c1530be763b9542a336aab1b4
author Ben Wagner <bungeman@chromium.org> Thu Dec 17 11:53:51 2020 -0500
committer Akira TAGOH <akira@tagoh.org> Thu Jan 07 07:03:42 2021 +0000
tree 21581fe3e5198e673728ca36dbcc5923d28e9379
parent e2c6b620b3f6430ed87e63e1bddd0513feb8e0ef

Clean up test-family-matching test.

Correct the type of TestMatchPattern's 'ret' from TestResult to
TestMatchResult to match the actual return type (and values assigned to
it).

Fix leak of TestMatchPattern's 'xml' and TestFamily's 'pat'.

Simplify TestMatchPattern cleanup and ensure cleanup always happens.

test/test-family-matching.c

diff --git a/test/test-family-matching.c b/test/test-family-matching.c
index 9fab36c..52cdbfc 100644
--- a/test/test-family-matching.c
+++ b/test/test-family-matching.c
@@ -55,51 +55,52 @@
         "</fontconfig>\n"
         "";
 
-    FcChar8 *xml, *concat;
-    FcConfig *cfg;
+    FcPattern *pat = NULL;
+    FcChar8 *concat = NULL;
+    FcChar8 *xml = NULL;
+    FcConfig *cfg = NULL;
     FcResult result;
     FcBool dummy;
-    TestResult ret = TestMatchError;
+    TestMatchResult ret = TestMatchError;
 
-    FcPattern *pat = FcPatternDuplicate (p);
+    pat = FcPatternDuplicate (p);
     if (!pat)
     {
         fprintf (stderr, "Unable to duplicate pattern.\n");
-        goto bail0;
+        goto bail;
     }
 
     concat = FcStrPlus (xml_pre, (const FcChar8 *) test);
     if (!concat)
     {
         fprintf (stderr, "Concatenation failed.\n");
-        goto bail0;
+        goto bail;
     }
 
     xml = FcStrPlus (concat, xml_post);
-    FcStrFree (concat);
     if (!xml)
     {
         fprintf (stderr, "Concatenation failed.\n");
-        goto bail0;
+        goto bail;
     }
 
     cfg = FcConfigCreate ();
     if (!cfg)
     {
         fprintf (stderr, "Unable to create a new empty config.\n");
-        return TestMatchError;
+        goto bail;
     }
 
     if (!FcConfigParseAndLoadFromMemory (cfg, xml, FcTrue))
     {
         fprintf (stderr, "Unable to load a config from memory.\n");
-        goto bail1;
+        goto bail;
     }
 
     if (!FcConfigSubstitute (cfg, pat, FcMatchPattern))
     {
         fprintf (stderr, "Unable to substitute config.\n");
-        goto bail1;
+        goto bail;
     }
 
     result = FcPatternGetBool (pat, FC_TEST_RESULT, 0, &dummy);
@@ -115,10 +116,15 @@
         break;
     }
 
-bail1:
-    FcConfigDestroy (cfg);
-bail0:
-    FcPatternDestroy (pat);
+bail:
+    if (cfg)
+	FcConfigDestroy (cfg);
+    if (xml)
+	FcStrFree (xml);
+    if (concat)
+	FcStrFree (concat);
+    if (pat)
+	FcPatternDestroy (pat);
     return ret;
 }
 
@@ -218,6 +224,7 @@
            "";
     SHOULD_NOT_MATCH(pat, test);
 
+    FcPatternDestroy (pat);
     return res;
 }