From 354ceb57781b7906c1c7d3adbc0c3439ae8b51d6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Fri, 24 Mar 2023 03:29:53 +0100 Subject: [PATCH] gtkwidget: Do a type-check in gtk_widget_in_destruction() Given it can be called during a widget destruction, it's safer to do a type-check before crashing. See: https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/1727 --- gtk/gtkwidget.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 123bf17745..2f510650a0 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -10635,7 +10635,11 @@ gtk_widget_set_has_focus (GtkWidget *widget, gboolean gtk_widget_in_destruction (GtkWidget *widget) { - GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget); + GtkWidgetPrivate *priv; + + g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); + + priv = gtk_widget_get_instance_private (widget); return priv->in_destruction; } -- 2.30.2