From bfd5040f4a082441c143c128d13063d28ddc1e32 Mon Sep 17 00:00:00 2001 From: Victor Toso Date: Thu, 13 Apr 2017 14:32:55 +0200 Subject: [PATCH 13/13] file-xfer: Fix bad filename encoding MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Manual for G_FILE_ATTRIBUTE_STANDARD_NAME states: > The name is the on-disk filename which may not be in any known > encoding, and can thus not be generally displayed as is. Considering a file named "ěščřžýáíé", if we use G_FILE_ATTRIBUTE_STANDARD_NAME to get the file name, we will have the following 72 bytes long string: "\xc4\x9b\xc5\xa1\xc4\x8d\xc5\x99\xc5\xbe\xc3\xbd\xc3\xa1\xc3\xad\xc3\xa9" This is a regression introduced at 4647ac9a2a72c98b6841180ccf5f8d Possible solutions are: 1) Using G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME attribute; 2) Using g_file_info_get_attribute_byte_string() function; 3) Using the g_file_get_basename() which was used before 4647ac9a2a72c9 Using option 2 based on better long term solution. This give us the correct 18 bytes long utf-8 string to "ěščřžýáíé" Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1440206 Signed-off-by: Victor Toso Acked-by: Christophe Fergeau (cherry picked from commit 5b9ad92814e3fc488cca8cba41b6af0caa390e1b) --- src/channel-main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/channel-main.c b/src/channel-main.c index 990a06a..b0878dd 100644 --- a/src/channel-main.c +++ b/src/channel-main.c @@ -2822,7 +2822,8 @@ static void file_xfer_init_task_async_cb(GObject *obj, GAsyncResult *res, gpoint GFileInfo *info; SpiceFileTransferTask *xfer_task; SpiceMainChannel *channel; - gchar *string, *basename; + gchar *string; + const gchar *basename; GKeyFile *keyfile; VDAgentFileXferStartMessage msg; guint64 file_size; @@ -2837,7 +2838,7 @@ static void file_xfer_init_task_async_cb(GObject *obj, GAsyncResult *res, gpoint goto failed; channel = spice_file_transfer_task_get_channel(xfer_task); - basename = g_file_info_get_attribute_as_string(info, G_FILE_ATTRIBUTE_STANDARD_NAME); + basename = g_file_info_get_attribute_byte_string(info, G_FILE_ATTRIBUTE_STANDARD_NAME); file_size = g_file_info_get_attribute_uint64(info, G_FILE_ATTRIBUTE_STANDARD_SIZE); xfer_op = data; @@ -2846,7 +2847,6 @@ static void file_xfer_init_task_async_cb(GObject *obj, GAsyncResult *res, gpoint keyfile = g_key_file_new(); g_key_file_set_string(keyfile, "vdagent-file-xfer", "name", basename); g_key_file_set_uint64(keyfile, "vdagent-file-xfer", "size", file_size); - g_free(basename); /* Save keyfile content to memory. TODO: more file attributions need to be sent to guest */ -- 2.12.2