diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-04-28 16:09:32 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-04-28 16:09:32 +0000 |
| commit | 604d171d5661f6eb51d385b8eb8485c96da7608b (patch) | |
| tree | 9f942a52f9b637b9c6ce921bbeb6145659879c9e | |
| parent | ac5f0ba341096987195ae4cfdfbf71cbc711576e (diff) | |
| parent | 65575fe0d00e5f63a062c475a75844510da0fd42 (diff) | |
| download | gtk+-604d171d5661f6eb51d385b8eb8485c96da7608b.tar.gz | |
Merge branch 'bookmark-fix' into 'master'
gtkplacessidebar.c: add bookmark null checking
See merge request GNOME/gtk!3479
| -rw-r--r-- | gtk/gtkplacessidebar.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c index 43f03069d8..ff29383f22 100644 --- a/gtk/gtkplacessidebar.c +++ b/gtk/gtkplacessidebar.c @@ -795,6 +795,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); |