From: Alexander Mikhaylenko <alexm@gnome.org>
Date: Thu, 18 Feb 2021 08:41:41 +0000 (+0500)
Subject: widget: Don't assume GtkWindow root in gtk_widget_propagate_state()
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1~1^2~83^2^2~392^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8e2f90e342515cefa0c5825715e761a60503e970;p=gtk4.git

widget: Don't assume GtkWindow root in gtk_widget_propagate_state()

Avoid crashes with GtkDragIcon children.
---

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 990d7c27ab..35a695e080 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -7748,16 +7748,22 @@ gtk_widget_propagate_state (GtkWidget          *widget,
 
   if (old_flags != new_flags)
     {
-      GtkWindowGroup *window_group;
       GtkRoot *root;
-      GtkWidget *grab;
+      GtkWidget *grab = NULL;
       gboolean shadowed;
 
       g_object_ref (widget);
 
       root = gtk_widget_get_root (widget);
-      window_group = gtk_window_get_group (GTK_WINDOW (root));
-      grab = gtk_window_group_get_current_grab (window_group);
+
+      if (GTK_IS_WINDOW (root))
+        {
+          GtkWindowGroup *window_group;
+
+          window_group = gtk_window_get_group (GTK_WINDOW (root));
+          grab = gtk_window_group_get_current_grab (window_group);
+        }
+
       shadowed = grab && grab != widget && !gtk_widget_is_ancestor (widget, grab);
 
       if (!gtk_widget_is_sensitive (widget) && gtk_widget_has_grab (widget))