procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix segfault on closing frame with tooltip (Bug#41239)

Browse source 
* src/gtkutil.c (xg_free_frame_widgets): Empty and unreference the
tooltip widget before destroying its label.
This commit is contained in:
Noam Postavsky 2020-05-24 20:14:48 -04:00
parent 104b68b670
commit 3b65fb7658
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gtkutil.c
View file

@ -1404,10 +1404,15 @@ xg_free_frame_widgets (struct frame *f)
FRAME_X_WINDOW (f) = 0; /* Set to avoid XDestroyWindow in xterm.c */
FRAME_X_RAW_DRAWABLE (f) = 0;
FRAME_GTK_OUTER_WIDGET (f) = 0;
if (x->ttip_widget)
{
/* Remove ttip_lbl from ttip_widget's custom slot before
destroying it, to avoid double-free (Bug#41239). */
gtk_tooltip_set_custom (x->ttip_widget, NULL);
g_object_unref (G_OBJECT (x->ttip_widget));
}
if (x->ttip_lbl)
gtk_widget_destroy (x->ttip_lbl);
if (x->ttip_widget)
g_object_unref (G_OBJECT (x->ttip_widget));
}
}