luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-23 18:52:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

gwinhttpfile: Set display-name attribute on file info

Browse Source 
It is not allowed to be `NULL` or unset if requested by the file
attribute matcher. Derive it from the basename. This doesn’t handle the
situation of a failed UTF-16 to UTF-8 conversion very well, but will at
least return something.

Note that the `g_filename_display_basename()` function can’t be used as
`GWinHttpFile` provides its URI in UTF-16 rather than in the file system
encoding.

This fixes a crash when using GIMP on Windows. Thanks to lillolollo for
in-depth debugging assistance.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Fixes: #2194
This commit is contained in:
Philip Withnall 2020-09-10 13:00:41 +01:00
parent 814372482b
commit bd99162d5c
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gio/win32/gwinhttpfile.c
View File

@ -29,6 +29,7 @@
#include "gio/gfile.h" #include "gio/gfile.h"
#include "gio/gfileattribute.h" #include "gio/gfileattribute.h"
#include "gio/gfileinfo.h" #include "gio/gfileinfo.h"
#include "gio/gfileinfo-priv.h"
#include "gwinhttpfile.h" #include "gwinhttpfile.h"
#include "gwinhttpfileinputstream.h" #include "gwinhttpfileinputstream.h"
#include "gwinhttpfileoutputstream.h" #include "gwinhttpfileoutputstream.h"
@ -177,6 +178,21 @@ g_winhttp_file_get_basename (GFile *file)
return retval; return retval;
} }
static char *
g_winhttp_file_get_display_name (GFile *file)
{
char *basename;
/* FIXME: This could be improved by using a new g_utf16_make_valid() function
* to recover what we can from the URI, and then suffixing it with
* “ (invalid encoding)” as per g_filename_display_basename(). */
basename = g_winhttp_file_get_basename (file);
if (!basename)
return g_strdup (_(" (invalid encoding)"));
return g_steal_pointer (&basename);
}
static char * static char *
g_winhttp_file_get_path (GFile *file) g_winhttp_file_get_path (GFile *file)
{ {
@ -513,6 +529,14 @@ g_winhttp_file_query_info (GFile *file,
g_file_info_set_name (info, basename); g_file_info_set_name (info, basename);
g_free (basename); g_free (basename);
if (_g_file_attribute_matcher_matches_id (matcher,
G_FILE_ATTRIBUTE_ID_STANDARD_DISPLAY_NAME))
{
char *display_name = g_winhttp_file_get_display_name (file);
g_file_info_set_display_name (info, display_name);
g_free (display_name);
}
content_length = NULL; content_length = NULL;
if (_g_winhttp_query_header (winhttp_file->vfs, if (_g_winhttp_query_header (winhttp_file->vfs,
request, request,