luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-19 23:28:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'leak-suppressions' into 'main'

Browse Source 
Add a few suppressions to glib.supp and fix a minor bug in gapplication test

See merge request GNOME/glib!3223
This commit is contained in:
Marco Trevisan
2023-01-26 15:40:22 +00:00
parent ac30b7d824 73205b8bbd
commit 452e9957a4
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gio/tests/gapplication.c
View File

@@ -1159,6 +1159,7 @@ test_replace (gconstpointer data)
gboolean name_lost = FALSE; gboolean name_lost = FALSE;
TestReplaceData data; TestReplaceData data;
GTestDBus *bus; GTestDBus *bus;
guint timeout_id = 0;
data.allow_replacement = allow; data.allow_replacement = allow;
data.subprocess = NULL; data.subprocess = NULL;
@@ -1173,7 +1174,7 @@ test_replace (gconstpointer data)
g_signal_connect (app, "activate", G_CALLBACK (activate), NULL); g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
if (!allow) if (!allow)
g_timeout_add_seconds (1, quit_already, app); timeout_id = g_timeout_add_seconds (1, quit_already, app);
g_application_run (app, G_N_ELEMENTS (argv) - 1, argv); g_application_run (app, G_N_ELEMENTS (argv) - 1, argv);
@@ -1183,6 +1184,7 @@ test_replace (gconstpointer data)
else else
g_assert_false (name_lost); g_assert_false (name_lost);
g_clear_handle_id (&timeout_id, g_source_remove);
g_object_unref (app); g_object_unref (app);
g_free (binpath); g_free (binpath);

14
tools/glib.supp
View File

@@ -505,7 +505,7 @@
{ {
g-system-thread-init-malloc g-system-thread-init-malloc
Memcheck:Leak Memcheck:Leak
match-leak-kinds:possible,reachable match-leak-kinds:possible,reachable,definite
fun:malloc fun:malloc
... ...
fun:g_system_thread_new fun:g_system_thread_new
@@ -843,7 +843,7 @@
# _g_unset_cached_tmp_dir() deliberately leaks the previous cached g_get_tmp_dir() values. # _g_unset_cached_tmp_dir() deliberately leaks the previous cached g_get_tmp_dir() values.
# These will not all be reachable on exit. # These will not all be reachable on exit.
{ {
g_get_tmp_dir g_get_tmp_dir_test_init
Memcheck:Leak Memcheck:Leak
match-leak-kinds:definite,reachable match-leak-kinds:definite,reachable
fun:malloc fun:malloc
@@ -853,6 +853,16 @@
fun:g_test_init fun:g_test_init
} }
# g_get_tmp_dir() caches a one-time allocation
{
g_get_tmp_dir
Memcheck:Leak
match-leak-kinds:definite,reachable
fun:malloc
...
fun:g_get_tmp_dir
}
# g_get_system_data_dirs() caches a one-time allocation # g_get_system_data_dirs() caches a one-time allocation
{ {
g_get_system_data_dirs g_get_system_data_dirs