AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

application: fix double free of app_id

Browse Source 
This is fallout from commit 257b42e2f9 -
those fields were already getting freed in
gtk_application_shutdown_x11() and my commit caused crashes on quit
instead.

Thanks to Rico Tzschichholz for reporting the bug and testing this fix.
This commit is contained in:
Cosimo Cecchi 2012-07-05 16:40:23 -04:00
parent 06c8739de4
commit f22226b3c9
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtkapplication.c
View File

@ -297,6 +297,9 @@ gtk_application_shutdown_x11 (GtkApplication *application)
g_clear_object (&application->priv->client_proxy);
g_free (application->priv->app_id);
g_free (application->priv->client_path);
g_free (application->priv->app_menu_path);
g_free (application->priv->menubar_path);
}
const gchar *
@ -666,17 +669,6 @@ gtk_application_finalize (GObject *object)
g_clear_object (&application->priv->app_menu);
g_clear_object (&application->priv->menubar);
#ifdef GDK_WINDOWING_X11
g_free (application->priv->app_menu_path);
g_free (application->priv->menubar_path);
g_free (application->priv->client_path);
g_free (application->priv->app_id);
g_clear_object (&application->priv->sm_proxy);
g_clear_object (&application->priv->client_proxy);
#endif
G_OBJECT_CLASS (gtk_application_parent_class)
->finalize (object);
}