From d7ea6429e14f101a885a5fbd6af3c8fc74060ab9 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Wed, 3 Aug 2011 11:25:33 -0300 Subject: [PATCH] Fix memory allocation in Proximity Monitor textfile get functions returns memory allocated using malloc. String is now being re-allocated using glib functions to keep the code standard in the Proximity Monitor code. --- proximity/monitor.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/proximity/monitor.c b/proximity/monitor.c index 3b90df540..f4ea0dfa3 100644 --- a/proximity/monitor.c +++ b/proximity/monitor.c @@ -93,13 +93,21 @@ static char *read_proximity_config(bdaddr_t *sba, bdaddr_t *dba, const char *alert) { char filename[PATH_MAX + 1], addr[18], key[38]; + char *str, *strnew; create_filename(filename, PATH_MAX, sba, "proximity"); ba2str(dba, addr); snprintf(key, sizeof(key), "%17s#%s", addr, alert); - return textfile_caseget(filename, key); + str = textfile_caseget(filename, key); + if (str == NULL) + return NULL; + + strnew = g_strdup(str); + free(str); + + return strnew; } static void char_discovered_cb(GSList *characteristics, guint8 status, -- 2.47.3