isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 16:10:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

test/wayland: Don't double-free GThreads

Browse Source 
g_thread_join() frees the thread object, so don't use g_autoptr
(Gthread) when they will all be joined.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3234>
This commit is contained in:
Jonas Ådahl 2023-09-01 23:28:41 +02:00 committed by Marge Bot
parent 06606b0b8e
commit 4a600e1031
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tests/wayland-client-tests.c
View File

@ -52,7 +52,7 @@ meta_test_wayland_client_indirect_self_terminate (void)
{ {
g_autoptr (MetaWaylandClient) client = NULL; g_autoptr (MetaWaylandClient) client = NULL;
g_autoptr (GError) error = NULL; g_autoptr (GError) error = NULL;
g_autoptr (GThread) thread = NULL; GThread *thread;
int fd; int fd;
gboolean client_destroyed = FALSE; gboolean client_destroyed = FALSE;
@ -116,7 +116,7 @@ meta_test_wayland_client_indirect_destroy (void)
DestroyTestData data; DestroyTestData data;
g_autoptr (MetaWaylandClient) client = NULL; g_autoptr (MetaWaylandClient) client = NULL;
g_autoptr (GError) error = NULL; g_autoptr (GError) error = NULL;
g_autoptr (GThread) thread = NULL; GThread *thread;
int fd; int fd;
gboolean client_destroyed = FALSE; gboolean client_destroyed = FALSE;

6
src/tests/wayland-unit-tests.c
View File

@ -765,9 +765,9 @@ wayland_registry_filter (void)
g_autoptr (MetaWaylandClient) client1 = NULL; g_autoptr (MetaWaylandClient) client1 = NULL;
g_autoptr (MetaWaylandClient) client2 = NULL; g_autoptr (MetaWaylandClient) client2 = NULL;
g_autoptr (MetaWaylandClient) client3 = NULL; g_autoptr (MetaWaylandClient) client3 = NULL;
g_autoptr (GThread) thread1 = NULL; GThread *thread1;
g_autoptr (GThread) thread2 = NULL; GThread *thread2;
g_autoptr (GThread) thread3 = NULL; GThread *thread3;
gboolean client1_destroyed = FALSE; gboolean client1_destroyed = FALSE;
gboolean client2_destroyed = FALSE; gboolean client2_destroyed = FALSE;
gboolean client3_destroyed = FALSE; gboolean client3_destroyed = FALSE;