Merge pull request emacs-mirror#5 from grahamc/schema-source-lookup

pgtkfns: g_settings_schema_source_lookup can return NULL
flatwhatson · Nov 20, 2019 · 138460e · 138460e
2 parents 5f4d8a2 + 9fa4924
commit 138460e
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/pgtkfns.c b/src/pgtkfns.c
@@ -1723,6 +1723,10 @@ parse_resource_key (const char *res_key, char *setting_key)
  /* check existence of setting_key */
  GSettingsSchemaSource *ssrc = g_settings_schema_source_get_default ();
  GSettingsSchema *scm = g_settings_schema_source_lookup (ssrc, SCHEMA_ID, FALSE);
+ if (scm == NULL) {
+ return NULL;
+ }
+
  if (!g_settings_schema_has_key (scm, setting_key)) {
  g_settings_schema_unref (scm);
  return NULL;