From 933af061e195665a0187f1299a151f8484c2cb0b Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 7 Nov 2002 23:20:32 +0000 Subject: [PATCH] Escape invalid filename before printing it out, since it isn't a valid Thu Nov 7 18:09:42 2002 Owen Taylor * gtk/gtkfilesel.c (open_new_dir): Escape invalid filename before printing it out, since it isn't a valid UTF-8 string. (#94676) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkfilesel.c | 4 +++- 7 files changed, 39 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5589d31eb..bbc0b6796 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Nov 7 18:09:42 2002 Owen Taylor + + * gtk/gtkfilesel.c (open_new_dir): Escape invalid + filename before printing it out, since it isn't + a valid UTF-8 string. (#94676) + Thu Nov 7 17:18:06 2002 Owen Taylor * gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_pixbuf): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5589d31eb..bbc0b6796 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu Nov 7 18:09:42 2002 Owen Taylor + + * gtk/gtkfilesel.c (open_new_dir): Escape invalid + filename before printing it out, since it isn't + a valid UTF-8 string. (#94676) + Thu Nov 7 17:18:06 2002 Owen Taylor * gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_pixbuf): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5589d31eb..bbc0b6796 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Thu Nov 7 18:09:42 2002 Owen Taylor + + * gtk/gtkfilesel.c (open_new_dir): Escape invalid + filename before printing it out, since it isn't + a valid UTF-8 string. (#94676) + Thu Nov 7 17:18:06 2002 Owen Taylor * gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_pixbuf): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5589d31eb..bbc0b6796 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Thu Nov 7 18:09:42 2002 Owen Taylor + + * gtk/gtkfilesel.c (open_new_dir): Escape invalid + filename before printing it out, since it isn't + a valid UTF-8 string. (#94676) + Thu Nov 7 17:18:06 2002 Owen Taylor * gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_pixbuf): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5589d31eb..bbc0b6796 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Thu Nov 7 18:09:42 2002 Owen Taylor + + * gtk/gtkfilesel.c (open_new_dir): Escape invalid + filename before printing it out, since it isn't + a valid UTF-8 string. (#94676) + Thu Nov 7 17:18:06 2002 Owen Taylor * gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_pixbuf): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5589d31eb..bbc0b6796 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Thu Nov 7 18:09:42 2002 Owen Taylor + + * gtk/gtkfilesel.c (open_new_dir): Escape invalid + filename before printing it out, since it isn't + a valid UTF-8 string. (#94676) + Thu Nov 7 17:18:06 2002 Owen Taylor * gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_pixbuf): diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c index 1d17af5e1..6ef064431 100644 --- a/gtk/gtkfilesel.c +++ b/gtk/gtkfilesel.c @@ -3071,10 +3071,12 @@ open_new_dir (gchar *dir_name, if (sent->entries[n_entries].entry_name == NULL || !g_utf8_validate (sent->entries[n_entries].entry_name, -1, NULL)) { + gchar *escaped_str = g_strescape (dirent, NULL); g_message (_("The filename \"%s\" couldn't be converted to UTF-8 " "(try setting the environment variable G_BROKEN_FILENAMES): %s"), - dirent, + escaped_str, error->message ? error->message : _("Invalid Utf-8")); + g_free (escaped_str); g_clear_error (&error); continue; } -- 2.43.2