diff options
| author | Geyslan G. Bem <geyslan@gmail.com> | 2021-04-27 11:42:55 -0300 |
|---|---|---|
| committer | Geyslan G. Bem <geyslan@gmail.com> | 2021-04-27 11:58:31 -0300 |
| commit | 1635998ac3482abf6153f857e8a16c8b8cf85158 (patch) | |
| tree | 780dba8064aefe3ef4ae7f6e12708c43117174a0 | |
| parent | b23529d940c17bce03a8b8c2c29a11f07800e962 (diff) | |
| download | gtk+-1635998ac3482abf6153f857e8a16c8b8cf85158.tar.gz | |
gtkplacessidebar.c: add bookmark null checking
This fixes nautilus crash and perhaps other callers issues.
Nautilus (and sometimes glib) crashes with malformed URI inside of the
bookmarks file .config/gtk-3.0/bookmarks when it has no LABEL.
This is result from the closed glib MR #2065 analysis and agreement.
https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2065#note_1091979
Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
| -rw-r--r-- | gtk/gtkplacessidebar.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c index 43f03069d8..c57031be07 100644 --- a/gtk/gtkplacessidebar.c +++ b/gtk/gtkplacessidebar.c @@ -795,6 +795,10 @@ 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); |