summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2022-01-18 23:50:47 +0000
committerMatthias Clasen <mclasen@redhat.com>2022-01-18 23:50:47 +0000
commit248783c202dc5a8201bc1258c90b3dc25e6fefe2 (patch)
tree2ee81cea7221d4669473f2be81f29a17d483397e
parent2f00ceb4926083cec9f2632970806e1720948157 (diff)
parentc7f9c80eb52a3180b5de9961506367c998b95ba0 (diff)
downloadgtk+-248783c202dc5a8201bc1258c90b3dc25e6fefe2.tar.gz
Merge branch 'fix-places-crash' into 'gtk-3-24'
gtkplacessidebar.c: add bookmark null checking See merge request GNOME/gtk!4399
-rw-r--r--gtk/gtkplacessidebar.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
index 118739fdd2..7ce19e8851 100644
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@@ -866,6 +866,9 @@ on_bookmark_query_info_complete (GObject *source,
{
/* Don't add non-UTF-8 bookmarks */
bookmark_name = g_file_get_basename (root);
+ if (bookmark_name == NULL)
+ goto out;
+
if (!g_utf8_validate (bookmark_name, -1, NULL))
{
g_free (bookmark_name);