[Spice-commits] src/channel-main.c

[Victor Toso de Carvalho]

 src/channel-main.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5b9ad92814e3fc488cca8cba41b6af0caa390e1b
Author: Victor Toso <me at victortoso.com>
Date:   Thu Apr 13 14:32:55 2017 +0200

    file-xfer: Fix bad filename encoding
    
    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 <victortoso at redhat.com>
    Acked-by: Christophe Fergeau <cfergeau at redhat.com>

diff --git a/src/channel-main.c b/src/channel-main.c
index be7c852..bbc5905 100644
--- a/src/channel-main.c
+++ b/src/channel-main.c
@@ -2831,7 +2831,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;
@@ -2846,7 +2847,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;
@@ -2855,7 +2856,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 */