commit cd77846bd9e2bab9c40048597ec0ee47604376c3
author Behdad Esfahbod <behdad@behdad.org> Tue Sep 14 08:35:19 2021 -0400
committer Behdad Esfahbod <behdad@behdad.org> Tue Sep 14 08:35:19 2021 -0400
tree 491dbda740681e5f4925365017edddb90e9ac057
parent da285d511f85d6189fdb213cd29f25730baaed02

[util] Fix leak of an hb_font_t

util/font-options.hh

diff --git a/util/font-options.hh b/util/font-options.hh
index 0f13ddd..fa1cffa 100644
--- a/util/font-options.hh
+++ b/util/font-options.hh
@@ -83,6 +83,7 @@
 void
 font_options_t::post_parse (GError **error)
 {
+  assert (!font);
   font = hb_font_create (face);
 
   if (font_size_x == FONT_SIZE_UPEM)
@@ -272,7 +273,8 @@
 		     "font",
 		     "Font-instance options:",
 		     "Options for the font instance",
-		     this);
+		     this,
+		     false /* We add below. */);
 
   const gchar *variations_help = "Comma-separated list of font variations\n"
     "\n"

util/options.hh

diff --git a/util/options.hh b/util/options.hh
index acb341f..790650b 100644
--- a/util/options.hh
+++ b/util/options.hh
@@ -110,12 +110,14 @@
 		  const gchar    *name,
 		  const gchar    *description,
 		  const gchar    *help_description,
-		  Type           *closure)
+		  Type           *closure,
+		  bool		  add_parse_hooks = true)
   {
     GOptionGroup *group = g_option_group_new (name, description, help_description,
 					      static_cast<gpointer>(closure), nullptr);
     g_option_group_add_entries (group, entries);
-    g_option_group_set_parse_hooks (group, nullptr, post_parse<Type>);
+    if (add_parse_hooks)
+      g_option_group_set_parse_hooks (group, nullptr, post_parse<Type>);
     g_option_context_add_group (context, group);
   }