From 3942590e7fa12698de16e7ff218badb1b9d70346 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 25 Sep 2023 22:10:53 +0200 Subject: [PATCH] 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 --- gtk/deprecated/gtktreeview.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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) */ -- 2.30.2