From: Benjamin Otte <otte@redhat.com>
Date: Mon, 25 Sep 2023 20:10:53 +0000 (+0200)
Subject: treeview: Fix crash in assertion
X-Git-Tag: archive/raspbian/4.12.4+ds-3+rpi1^2~21^2~1^2~17
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3942590e7fa12698de16e7ff218badb1b9d70346;p=gtk4.git

treeview: Fix crash in assertion

The fix in commit a267dfac5d25d4ba5c1a95c82999d008fee07ac3 is wrong.
The function can return FALSE in normal operation.

Instead do a check for node == NULL that gracefully returns FALSE instead.

Fixes: #6114
---

diff --git a/gtk/deprecated/gtktreeview.c b/gtk/deprecated/gtktreeview.c
index e9626e84fb..247bfaf5a7 100644
--- a/gtk/deprecated/gtktreeview.c
+++ b/gtk/deprecated/gtktreeview.c
@@ -12833,9 +12833,12 @@ gtk_tree_view_is_blank_at_pos (GtkTreeView       *tree_view,
     *column = real_column;
 
   gtk_tree_model_get_iter (priv->model, &iter, real_path);
-  if (!_gtk_tree_view_find_node (tree_view, real_path, &tree, &node))
+  _gtk_tree_view_find_node (tree_view, real_path, &tree, &node);
+  if (node == NULL)
     {
-      g_assert_not_reached ();
+      if (!path)
+        gtk_tree_path_free (real_path);
+      return TRUE;
     }
 
   /* Check if there's an expander arrow at (x, y) */