From 6f9b379c08bcb12a91b1fc01c9c113c9b7975361 Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Thu, 10 Sep 2020 13:00:41 +0100
Subject: [PATCH 1/2] gwinhttpfile: Set display-name attribute on file info
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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
---
 gio/win32/gwinhttpfile.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gio/win32/gwinhttpfile.c b/gio/win32/gwinhttpfile.c
index cf5eed31d..509cdeb33 100644
--- a/gio/win32/gwinhttpfile.c
+++ b/gio/win32/gwinhttpfile.c
@@ -29,6 +29,7 @@
 #include "gio/gfile.h"
 #include "gio/gfileattribute.h"
 #include "gio/gfileinfo.h"
+#include "gio/gfileinfo-priv.h"
 #include "gwinhttpfile.h"
 #include "gwinhttpfileinputstream.h"
 #include "gwinhttpfileoutputstream.h"
@@ -177,6 +178,21 @@ g_winhttp_file_get_basename (GFile *file)
   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 *
 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_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;
   if (_g_winhttp_query_header (winhttp_file->vfs,
                                request,

From 9d859f001d8dbf87c479ba8528a2e60d0b5328b7 Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Thu, 10 Sep 2020 13:02:54 +0100
Subject: [PATCH 2/2] gutf8: Fix a typo in the docs for g_utf16_to_utf8()

Signed-off-by: Philip Withnall <withnall@endlessm.com>
---
 glib/gutf8.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glib/gutf8.c b/glib/gutf8.c
index bcb4f56bc..51ad0d09b 100644
--- a/glib/gutf8.c
+++ b/glib/gutf8.c
@@ -1006,7 +1006,7 @@ g_ucs4_to_utf8 (const gunichar *str,
  * string; it may e.g. include embedded NUL characters. The only
  * validation done by this function is to ensure that the input can
  * be correctly interpreted as UTF-16, i.e. it doesn't contain
- * things unpaired surrogates.
+ * unpaired surrogates or partial character sequences.
  *
  * Returns: (transfer full): a pointer to a newly allocated UTF-8 string.
  *     This value must be freed with g_free(). If an error occurs,