diff --git a/cfg/gtk.cfg b/cfg/gtk.cfg index 024f567c922..c7cd4793ad2 100644 --- a/cfg/gtk.cfg +++ b/cfg/gtk.cfg @@ -717,6 +717,12 @@ g_variant_type_dup_string g_value_dup_string g_register_data + g_idle_add + g_idle_add_full + g_timeout_add + g_timeout_add_full + g_timeout_add_seconds + g_timeout_add_seconds_full g_free @@ -4237,19 +4243,17 @@ - false - + - false @@ -5652,7 +5656,6 @@ - false @@ -5663,13 +5666,12 @@ - + - false @@ -5684,7 +5686,7 @@ - + diff --git a/test/cfg/gtk.c b/test/cfg/gtk.c index 2612b572638..c28eb483f45 100644 --- a/test/cfg/gtk.c +++ b/test/cfg/gtk.c @@ -730,3 +730,50 @@ int g_define_enum_and_flags_type_test(void) { return e + f; } #endif + +static gboolean source_func_frees_data(gpointer data) +{ + g_free(data); + return FALSE; +} + +static void destroy_notify_frees_data(gpointer data) +{ + g_free(data); +} + +// The data passed to a GSource is owned by the callback or the destroy notify +// from then on, so it does not leak. +void g_idle_add_takes_data_test(void) +{ + gchar *data = g_strdup("data"); + g_idle_add(source_func_frees_data, data); + + gchar *data_full = g_strdup("data"); + g_idle_add_full(200, source_func_frees_data, data_full, NULL); +} + +void g_timeout_add_takes_data_test(void) +{ + gchar *data = g_strdup("data"); + g_timeout_add(10, source_func_frees_data, data); + + gchar *data_seconds = g_strdup("data"); + g_timeout_add_seconds(1, source_func_frees_data, data_seconds); + + gchar *data_full = g_strdup("data"); + g_timeout_add_full(0, 10, source_func_frees_data, data_full, destroy_notify_frees_data); + + gchar *data_seconds_full = g_strdup("data"); + g_timeout_add_seconds_full(0, 1, source_func_frees_data, data_seconds_full, destroy_notify_frees_data); +} + +// Handing over data that is already freed is a use after free. +// TODO: functions don't get the deallocuse check yet. +void g_idle_add_freed_data_test(void) +{ + gchar *data = g_strdup("data"); + g_free(data); + // TODO cppcheck-suppress deallocuse + g_idle_add(source_func_frees_data, data); +}