luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-21 22:59:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

glib-compile-schemas: Fix various memory leaks

Browse Source 
Spotted while running `make check` under Valgrind. While it’s not
necessary to fix memory leaks in glib-compile-schemas (since it’s a
utility which runs briefly then exits), fixing them makes more
legitimate leaks in the Valgrind output more obvious, and means we can
be sure there aren’t leaks in the underlying GLib/GIO code which
glib-compile-schemas is calling.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

https://bugzilla.gnome.org/show_bug.cgi?id=779265
This commit is contained in:
Philip Withnall 2017-02-27 10:02:48 +00:00
parent c61ea2c4a9
commit d6d29a2e9f
1 changed files with 65 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
gio/glib-compile-schemas.c
View File

@ -879,6 +879,7 @@ schema_state_free (gpointer data)
g_free (state->path); g_free (state->path);
g_free (state->gettext_domain); g_free (state->gettext_domain);
g_hash_table_unref (state->keys); g_hash_table_unref (state->keys);
g_slice_free (SchemaState, state);
} }
static void static void
@ -1621,6 +1622,12 @@ gvdb_pair_init (GvdbPair *pair)
pair->root = gvdb_hash_table_insert (pair->table, ""); pair->root = gvdb_hash_table_insert (pair->table, "");
} }
static void
gvdb_pair_clear (GvdbPair *pair)
{
g_hash_table_unref (pair->table);
}
typedef struct typedef struct
{ {
GHashTable *schema_table; GHashTable *schema_table;
@ -1643,6 +1650,7 @@ output_key (gpointer key,
const gchar *name; const gchar *name;
KeyState *state; KeyState *state;
GvdbItem *item; GvdbItem *item;
GVariant *serialised = NULL;
name = key; name = key;
state = value; state = value;
@ -1650,7 +1658,9 @@ output_key (gpointer key,
item = gvdb_hash_table_insert (data->pair.table, name); item = gvdb_hash_table_insert (data->pair.table, name);
gvdb_item_set_parent (item, data->pair.root); gvdb_item_set_parent (item, data->pair.root);
gvdb_item_set_value (item, key_state_serialise (state)); serialised = key_state_serialise (state);
gvdb_item_set_value (item, serialised);
g_variant_unref (serialised);
if (state->l10n) if (state->l10n)
data->l10n = TRUE; data->l10n = TRUE;
@ -1702,6 +1712,8 @@ output_schema (gpointer key,
gvdb_hash_table_insert_string (data.pair.table, gvdb_hash_table_insert_string (data.pair.table,
".gettext-domain", ".gettext-domain",
state->gettext_domain); state->gettext_domain);
gvdb_pair_clear (&data.pair);
} }
static gboolean static gboolean
@ -1796,6 +1808,8 @@ parse_gschema_files (gchar **files,
g_hash_table_unref (state.flags_table); g_hash_table_unref (state.flags_table);
g_hash_table_unref (state.enum_table); g_hash_table_unref (state.enum_table);
g_free (contents);
return NULL; return NULL;
} }
else else
@ -1803,6 +1817,7 @@ parse_gschema_files (gchar **files,
} }
/* cleanup */ /* cleanup */
g_free (contents);
g_markup_parse_context_free (context); g_markup_parse_context_free (context);
g_slist_free (state.this_file_schemas); g_slist_free (state.this_file_schemas);
g_slist_free (state.this_file_flagss); g_slist_free (state.this_file_flagss);
@ -2020,19 +2035,20 @@ set_overrides (GHashTable *schema_table,
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
GError *error; GError *error = NULL;
GHashTable *table; GHashTable *table = NULL;
GDir *dir; GDir *dir = NULL;
const gchar *file; const gchar *file;
gchar *srcdir; const gchar *srcdir;
gboolean show_version_and_exit = FALSE; gboolean show_version_and_exit = FALSE;
gchar *targetdir = NULL; gchar *targetdir = NULL;
gchar *target; gchar *target = NULL;
gboolean dry_run = FALSE; gboolean dry_run = FALSE;
gboolean strict = FALSE; gboolean strict = FALSE;
gchar **schema_files = NULL; gchar **schema_files = NULL;
gchar **override_files = NULL; gchar **override_files = NULL;
GOptionContext *context; GOptionContext *context = NULL;
gint retval;
GOptionEntry entries[] = { GOptionEntry entries[] = {
{ "version", 0, 0, G_OPTION_ARG_NONE, &show_version_and_exit, N_("Show program version and exit"), NULL }, { "version", 0, 0, G_OPTION_ARG_NONE, &show_version_and_exit, N_("Show program version and exit"), NULL },
{ "targetdir", 0, 0, G_OPTION_ARG_FILENAME, &targetdir, N_("where to store the gschemas.compiled file"), N_("DIRECTORY") }, { "targetdir", 0, 0, G_OPTION_ARG_FILENAME, &targetdir, N_("where to store the gschemas.compiled file"), N_("DIRECTORY") },
@ -2046,7 +2062,7 @@ main (int argc, char **argv)
}; };
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
gchar *tmp; gchar *tmp = NULL;
#endif #endif
setlocale (LC_ALL, ""); setlocale (LC_ALL, "");
@ -2055,7 +2071,6 @@ main (int argc, char **argv)
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
tmp = _glib_get_locale_dir (); tmp = _glib_get_locale_dir ();
bindtextdomain (GETTEXT_PACKAGE, tmp); bindtextdomain (GETTEXT_PACKAGE, tmp);
g_free (tmp);
#else #else
bindtextdomain (GETTEXT_PACKAGE, GLIB_LOCALE_DIR); bindtextdomain (GETTEXT_PACKAGE, GLIB_LOCALE_DIR);
#endif #endif
@ -2072,33 +2087,30 @@ main (int argc, char **argv)
"and the cache file is called gschemas.compiled.")); "and the cache file is called gschemas.compiled."));
g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
error = NULL;
if (!g_option_context_parse (context, &argc, &argv, &error)) if (!g_option_context_parse (context, &argc, &argv, &error))
{ {
fprintf (stderr, "%s\n", error->message); fprintf (stderr, "%s\n", error->message);
return 1; retval = 1;
goto done;
} }
g_option_context_free (context);
if (show_version_and_exit) if (show_version_and_exit)
{ {
g_print (PACKAGE_VERSION "\n"); g_print (PACKAGE_VERSION "\n");
return 0; retval = 0;
goto done;
} }
if (!schema_files && argc != 2) if (!schema_files && argc != 2)
{ {
fprintf (stderr, _("You should give exactly one directory name\n")); fprintf (stderr, _("You should give exactly one directory name\n"));
return 1; retval = 1;
goto done;
} }
srcdir = argv[1]; srcdir = argv[1];
if (targetdir == NULL) target = g_build_filename (targetdir ? targetdir : srcdir, "gschemas.compiled", NULL);
targetdir = srcdir;
target = g_build_filename (targetdir, "gschemas.compiled", NULL);
if (!schema_files) if (!schema_files)
{ {
@ -2112,7 +2124,12 @@ main (int argc, char **argv)
if (dir == NULL) if (dir == NULL)
{ {
fprintf (stderr, "%s\n", error->message); fprintf (stderr, "%s\n", error->message);
return 1;
g_ptr_array_unref (files);
g_ptr_array_unref (overrides);
retval = 1;
goto done;
} }
while ((file = g_dir_read_name (dir)) != NULL) while ((file = g_dir_read_name (dir)) != NULL)
@ -2136,7 +2153,11 @@ main (int argc, char **argv)
else else
fprintf (stdout, _("removed existing output file.\n")); fprintf (stdout, _("removed existing output file.\n"));
return 0; g_ptr_array_unref (files);
g_ptr_array_unref (overrides);
retval = 0;
goto done;
} }
g_ptr_array_sort (files, compare_strings); g_ptr_array_sort (files, compare_strings);
g_ptr_array_add (files, NULL); g_ptr_array_add (files, NULL);
@ -2150,27 +2171,42 @@ main (int argc, char **argv)
if ((table = parse_gschema_files (schema_files, strict)) == NULL) if ((table = parse_gschema_files (schema_files, strict)) == NULL)
{ {
g_free (target); retval = 1;
return 1; goto done;
} }
if (override_files != NULL && if (override_files != NULL &&
!set_overrides (table, override_files, strict)) !set_overrides (table, override_files, strict))
{ {
g_free (target); retval = 1;
return 1; goto done;
} }
if (!dry_run && !write_to_file (table, target, &error)) if (!dry_run && !write_to_file (table, target, &error))
{ {
fprintf (stderr, "%s\n", error->message); fprintf (stderr, "%s\n", error->message);
g_free (target); retval = 1;
return 1; goto done;
} }
g_free (target); /* Success. */
retval = 0;
return 0; done:
g_clear_error (&error);
g_clear_pointer (&table, g_hash_table_unref);
g_clear_pointer (&dir, g_dir_close);
g_free (targetdir);
g_free (target);
g_strfreev (schema_files);
g_strfreev (override_files);
g_option_context_free (context);
#ifdef G_OS_WIN32
g_free (tmp);
#endif
return retval;
} }
/* Epilogue {{{1 */ /* Epilogue {{{1 */