From: Jonas Ådahl <jadahl@gmail.com>
Date: Tue, 9 May 2017 15:07:02 +0000 (+0800)
Subject: GtkWindow: Don't double free export user data
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~563
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d8bb38588afb6511dca1e144d4d1ba8f934f2e8b;p=gtk%2B3.0.git

GtkWindow: Don't double free export user data

The user data passed when exporting a Wayland window was supposed to be
freed using the destroy_func, as is commonly done. This was previously
broken, as the user data was just NULL:ed when exported, and only
actually destroyed when unexporting before having exported.

While e016d9a5dba6f6f99aee94d0b72c00bee299b96a fixed this, it introduced
a regression, as GtkWindow was nice enough to free the memory anyway
after having received the exported handle, causing it now to double
free.

https://bugzilla.gnome.org/show_bug.cgi?id=782109
---

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 3404d951ee..55924bbf6c 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -12664,8 +12664,6 @@ wayland_window_handle_exported (GdkWindow  *window,
   handle_str = g_strdup_printf ("wayland:%s", wayland_handle_str);
   data->callback (data->window, handle_str, data->user_data);
   g_free (handle_str);
-
-  g_free (data);
 }
 #endif