From ade35760a5a073eac87ce7fdea1373b769b0eff3 Mon Sep 17 00:00:00 2001
From: Po Lu <luangruo@yahoo.com>
Date: Sun, 15 May 2022 17:38:21 +0800
Subject: [PATCH] Fix use of more invalid keys in PGTK GSettings code

* src/xsettings.c (apply_gsettings_font_hinting):
(apply_gsettings_font_rgba_order): Test for key existence before
using it.
---
 src/xsettings.c | 72 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 44 insertions(+), 28 deletions(-)

diff --git a/src/xsettings.c b/src/xsettings.c
index 16625bd229f..2e33ef958ac 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -230,6 +230,29 @@ static GSettings *gsettings_client;
 /* The cairo font_options as obtained using gsettings.  */
 static cairo_font_options_t *font_options;
 
+static bool
+xg_settings_key_valid_p (GSettings *settings, const char *key)
+{
+#ifdef GLIB_VERSION_2_32
+  GSettingsSchema *schema;
+  bool rc;
+
+  g_object_get (G_OBJECT (settings),
+		"settings-schema", &schema,
+		NULL);
+
+  if (!schema)
+    return false;
+
+  rc = g_settings_schema_has_key (schema, key);
+  g_settings_schema_unref (schema);
+
+  return rc;
+#else
+  return false;
+#endif
+}
+
 /* Store an event for re-rendering of the fonts.  */
 static void
 store_font_options_changed (void)
@@ -243,13 +266,21 @@ store_font_options_changed (void)
 static void
 apply_gsettings_font_hinting (GSettings *settings)
 {
-  GVariant *val = g_settings_get_value (settings, GSETTINGS_FONT_HINTING);
+  GVariant *val;
+  const char *hinting;
+
+  if (!xg_settings_key_valid_p (settings, GSETTINGS_FONT_HINTING))
+    return;
+
+  val = g_settings_get_value (settings, GSETTINGS_FONT_HINTING);
+
   if (val)
     {
       g_variant_ref_sink (val);
+
       if (g_variant_is_of_type (val, G_VARIANT_TYPE_STRING))
 	{
-	  const char *hinting = g_variant_get_string (val, NULL);
+	  hinting = g_variant_get_string (val, NULL);
 
 	  if (!strcmp (hinting, "full"))
 	    cairo_font_options_set_hint_style (font_options,
@@ -268,29 +299,6 @@ apply_gsettings_font_hinting (GSettings *settings)
     }
 }
 
-static bool
-xg_settings_key_valid_p (GSettings *settings, const char *key)
-{
-#ifdef GLIB_VERSION_2_32
-  GSettingsSchema *schema;
-  bool rc;
-
-  g_object_get (G_OBJECT (settings),
-		"settings-schema", &schema,
-		NULL);
-
-  if (!schema)
-    return false;
-
-  rc = g_settings_schema_has_key (schema, key);
-  g_settings_schema_unref (schema);
-
-  return rc;
-#else
-  return false;
-#endif
-}
-
 /* Apply changes in the antialiasing system setting.  */
 static void
 apply_gsettings_font_antialias (GSettings *settings)
@@ -328,14 +336,22 @@ apply_gsettings_font_antialias (GSettings *settings)
 static void
 apply_gsettings_font_rgba_order (GSettings *settings)
 {
-  GVariant *val = g_settings_get_value (settings,
-					GSETTINGS_FONT_RGBA_ORDER);
+  GVariant *val;
+  const char *rgba_order;
+
+  if (!xg_settings_key_valid_p (settings, GSETTINGS_FONT_RGBA_ORDER))
+    return;
+
+  val = g_settings_get_value (settings,
+			      GSETTINGS_FONT_RGBA_ORDER);
+
   if (val)
     {
       g_variant_ref_sink (val);
+
       if (g_variant_is_of_type (val, G_VARIANT_TYPE_STRING))
 	{
-	  const char *rgba_order = g_variant_get_string (val, NULL);
+	  rgba_order = g_variant_get_string (val, NULL);
 
 	  if (!strcmp (rgba_order, "rgb"))
 	    cairo_font_options_set_subpixel_order (font_options,
-- 
2.39.2