From: Benjamin Otte <otte@redhat.com>
Date: Sat, 27 May 2023 17:05:32 +0000 (+0200)
Subject: stringsorter: Handle NULL strings
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~183^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ee22f8f52facd1ea210e6e221aed33a72842a0d0;p=gtk4.git

stringsorter: Handle NULL strings

NULL is a valid string GValue, so we need to handle it.
The utf8 normalizing and collating functions do not, so we better catch
it early.
---

diff --git a/gtk/gtkstringsorter.c b/gtk/gtkstringsorter.c
index 15866b9304..694e6318c5 100644
--- a/gtk/gtkstringsorter.c
+++ b/gtk/gtkstringsorter.c
@@ -77,6 +77,11 @@ gtk_string_sorter_get_key (GtkExpression *expression,
     return NULL;
 
   string = g_value_get_string (&value);
+  if (string == NULL)
+    {
+      g_value_unset (&value);
+      return NULL;
+    }
 
   if (ignore_case)
     s = g_utf8_casefold (string, -1);