linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH BlueZ] Fix error when proximity config file is missing
@ 2011-08-03 14:45 Claudio Takahasi
  2011-08-08 10:23 ` Johan Hedberg
  0 siblings, 1 reply; 2+ messages in thread
From: Claudio Takahasi @ 2011-08-03 14:45 UTC (permalink / raw)
  To: linux-bluetooth; +Cc: Claudio Takahasi

Adds checking to avoid the following GLib critical error:
Parsing /etc/bluetooth/proximity.conf failed: No such file or directory
GLib-CRITICAL **: g_key_file_get_string_list: assertion `key_file !=
NULL' failed
---
 proximity/manager.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/proximity/manager.c b/proximity/manager.c
index a9526a1..30384d1 100644
--- a/proximity/manager.c
+++ b/proximity/manager.c
@@ -83,6 +83,9 @@ static void load_config_file(GKeyFile *config)
 	char **list;
 	int i;
 
+	if (config == NULL)
+		return;
+
 	list = g_key_file_get_string_list(config, "General", "Disable",
 								NULL, NULL);
 	for (i = 0; list && list[i] != NULL; i++) {
-- 
1.7.6


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH BlueZ] Fix error when proximity config file is missing
  2011-08-03 14:45 [PATCH BlueZ] Fix error when proximity config file is missing Claudio Takahasi
@ 2011-08-08 10:23 ` Johan Hedberg
  0 siblings, 0 replies; 2+ messages in thread
From: Johan Hedberg @ 2011-08-08 10:23 UTC (permalink / raw)
  To: Claudio Takahasi; +Cc: linux-bluetooth

Hi,

On Wed, Aug 03, 2011, Claudio Takahasi wrote:
> Adds checking to avoid the following GLib critical error:
> Parsing /etc/bluetooth/proximity.conf failed: No such file or directory
> GLib-CRITICAL **: g_key_file_get_string_list: assertion `key_file !=
> NULL' failed
> ---
>  proximity/manager.c |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)

This one has also been applied. Thanks.

Johan

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-08-08 10:23 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-03 14:45 [PATCH BlueZ] Fix error when proximity config file is missing Claudio Takahasi
2011-08-08 10:23 ` Johan Hedberg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).