devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-23 21:46:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix few memory leaks

Browse Source
This commit is contained in:
Dmitry Podgorny
2020-02-27 01:35:36 +02:00
parent 779c2efc17
commit d18ec23d0a
3 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/config/preferences.c
View File

@@ -80,7 +80,7 @@ static const char* _get_key(preference_t pref);
static gboolean _get_default_boolean(preference_t pref);
static char* _get_default_string(preference_t pref);
void _prefs_load(void)
static void _prefs_load(void)
{
GError *err = NULL;
log_maxsize = g_key_file_get_integer(prefs, PREF_GROUP_LOGGING, "maxsize", &err);
@@ -166,9 +166,23 @@ void _prefs_load(void)
g_strfreev(triggers);
}
/* Clean up after _prefs_load() */
static void _prefs_close(void)
{
autocomplete_free(boolean_choice_ac);
autocomplete_free(room_trigger_ac);
}
void
prefs_reload(void)
{
/*
* Current function contains copy-paste, but we wanted to avoid config_file
* manipulation from prefs_load/prefs_close
*/
_prefs_close();
g_key_file_free(prefs);
prefs = NULL;
@@ -185,7 +199,7 @@ prefs_load(char *config_file)
if (config_file == NULL) {
prefs_loc = files_get_config_path(FILE_PROFRC);
} else {
prefs_loc = config_file;
prefs_loc = strdup(config_file);
}
if (g_file_test(prefs_loc, G_FILE_TEST_EXISTS)) {
@@ -207,8 +221,7 @@ prefs_save(void)
void
prefs_close(void)
{
autocomplete_free(boolean_choice_ac);
autocomplete_free(room_trigger_ac);
_prefs_close();
g_key_file_free(prefs);
prefs = NULL;