1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
From 4850cb55d3415b7d95c80c80ceb60f221f5dddf5 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Wed, 24 Feb 2016 18:58:25 +0100
Subject: [PATCH] gsettings: Don't crash when no schemas are installed
Still doesn't behave well ("gsettings help" causes an error),
but at least there's no segfault anymore.
---
gio/gsettings-tool.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/gio/gsettings-tool.c b/gio/gsettings-tool.c
index 6a302ce..0026f55 100644
--- a/gio/gsettings-tool.c
+++ b/gio/gsettings-tool.c
@@ -697,7 +697,7 @@ main (int argc, char **argv)
if (argc < 2)
return gsettings_help (FALSE, NULL);
- global_schema_source = g_settings_schema_source_ref (g_settings_schema_source_get_default ());
+ global_schema_source = g_settings_schema_source_get_default ();
if (argc > 3 && g_str_equal (argv[1], "--schemadir"))
{
@@ -705,7 +705,6 @@ main (int argc, char **argv)
GError *error = NULL;
global_schema_source = g_settings_schema_source_new_from_directory (argv[2], parent, FALSE, &error);
- g_settings_schema_source_unref (parent);
if (global_schema_source == NULL)
{
@@ -719,6 +718,13 @@ main (int argc, char **argv)
argv = argv + 2;
argc -= 2;
}
+ else if (global_schema_source == NULL)
+ {
+ g_printerr (_("No schemas installed\n"));
+ return 1;
+ }
+ else
+ g_settings_schema_source_ref (global_schema_source);
need_settings = TRUE;
--
2.7.1
|
