luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-13 07:56:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'leaks' into 'main'

Browse Source 
Some leaks fixes

See merge request GNOME/glib!2959
This commit is contained in:
Philip Withnall 2022-10-17 10:46:52 +00:00
commit b7f2b09c30
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gio/giomodule.c
View File

@ -581,12 +581,8 @@ g_io_modules_scan_all_in_directory_with_scope (const char *dirname,
if (g_type_module_use (G_TYPE_MODULE (module)))
g_type_module_unuse (G_TYPE_MODULE (module)); /* Unload */
else
{ /* Failure to load */
g_printerr ("Failed to load module: %s\n", path);
g_object_unref (module);
g_free (path);
continue;
}
g_printerr ("Failed to load module: %s\n", path);
g_object_unref (module);
}
g_free (path);

6
gio/tests/gmenumodel.c
View File

@ -1318,6 +1318,7 @@ test_attribute_iter (void)
iter = g_menu_model_iterate_item_attributes (G_MENU_MODEL (menu), 0);
while (g_menu_attribute_iter_get_next (iter, &name, &v))
g_hash_table_insert (found, g_strdup (name), v);
g_object_unref (iter);
g_assert_cmpint (g_hash_table_size (found), ==, 6);
@ -1363,19 +1364,23 @@ test_links (void)
item = g_menu_item_new ("test2", NULL);
g_menu_item_set_link (item, "submenu", m);
g_menu_prepend_item (menu, item);
g_object_unref (item);
item = g_menu_item_new ("test1", NULL);
g_menu_item_set_link (item, "section", m);
g_menu_insert_item (menu, 0, item);
g_object_unref (item);
item = g_menu_item_new ("test3", NULL);
g_menu_item_set_link (item, "wallet", m);
g_menu_insert_item (menu, 1000, item);
g_object_unref (item);
item = g_menu_item_new ("test4", NULL);
g_menu_item_set_link (item, "purse", m);
g_menu_item_set_link (item, "purse", NULL);
g_menu_append_item (menu, item);
g_object_unref (item);
g_assert_cmpint (g_menu_model_get_n_items (G_MENU_MODEL (menu)), ==, 4);
@ -1456,6 +1461,7 @@ test_convenience (void)
g_object_unref (m1);
g_object_unref (m2);
g_object_unref (sub);
}
static void