colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: fix leak parsing config file

Browse Source
This commit is contained in:
Dan Williams
2010-12-10 18:50:49 -06:00
parent 898e08eef1
commit fd5e8c2f05
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.c
View File

@@ -306,6 +306,7 @@ parse_config_file (const char *filename,
GError **error) GError **error)
{ {
GKeyFile *config; GKeyFile *config;
gboolean success = FALSE;
config = g_key_file_new (); config = g_key_file_new ();
if (!config) { if (!config) {
@@ -316,11 +317,11 @@ parse_config_file (const char *filename,
g_key_file_set_list_separator (config, ','); g_key_file_set_list_separator (config, ',');
if (!g_key_file_load_from_file (config, filename, G_KEY_FILE_NONE, error)) if (!g_key_file_load_from_file (config, filename, G_KEY_FILE_NONE, error))
return FALSE; goto out;
*plugins = g_key_file_get_value (config, "main", "plugins", error); *plugins = g_key_file_get_value (config, "main", "plugins", error);
if (*error) if (*error)
return FALSE; goto out;
*dhcp_client = g_key_file_get_value (config, "main", "dhcp", NULL); *dhcp_client = g_key_file_get_value (config, "main", "dhcp", NULL);
*dns_plugins = g_key_file_get_string_list (config, "main", "dns", NULL, NULL); *dns_plugins = g_key_file_get_string_list (config, "main", "dns", NULL, NULL);
@@ -328,8 +329,11 @@ parse_config_file (const char *filename,
*log_level = g_key_file_get_value (config, "logging", "level", NULL); *log_level = g_key_file_get_value (config, "logging", "level", NULL);
*log_domains = g_key_file_get_value (config, "logging", "domains", NULL); *log_domains = g_key_file_get_value (config, "logging", "domains", NULL);
success = TRUE;
out:
g_key_file_free (config); g_key_file_free (config);
return TRUE; return success;
} }
static gboolean static gboolean