diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-04-19 23:25:15 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-04-19 23:25:15 +0000 |
| commit | c7147397592d63ca355a5f0289e1f66d8243f9b7 (patch) | |
| tree | 01925be2b40c48e122f2d38503ddac3f75daed48 | |
| parent | 191433bf0ac68e663083b2bbdb83bfb23474c6ea (diff) | |
| parent | 536da7a15c1737bc63c8ecba5ccac40cc2170860 (diff) | |
| download | gtk+-c7147397592d63ca355a5f0289e1f66d8243f9b7.tar.gz | |
Merge branch 'fix-uri-crash-3' into 'gtk-3-24'
Fix a possible crash in gtk_show_uri
See merge request GNOME/gtk!3458
| -rw-r--r-- | gdk/x11/gdkapplaunchcontext-x11.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gdk/x11/gdkapplaunchcontext-x11.c b/gdk/x11/gdkapplaunchcontext-x11.c index 8051229ba5..2341bb2e1f 100644 --- a/gdk/x11/gdkapplaunchcontext-x11.c +++ b/gdk/x11/gdkapplaunchcontext-x11.c @@ -45,6 +45,9 @@ get_display_name (GFile *file, if (name == NULL) { name = g_file_get_basename (file); + if (name == NULL) + name = g_file_get_uri (file); + if (!g_utf8_validate (name, -1, NULL)) { tmp = name; |