From: Marco Trevisan (Treviño) <mail@3v1n0.net>
Date: Fri, 24 Mar 2023 02:29:53 +0000 (+0100)
Subject: gtkwidget: Do a type-check in gtk_widget_in_destruction()
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~511^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=07197a299f1a3ebc644c1d2c0aa09707763c0a6c;p=gtk4.git

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
---

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index eaf7f04d11..531b0f4314 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -10638,7 +10638,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;
 }