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

main-utils: don't leak description for command line arguments in nm_main_utils_early_setup()

Browse Source
This commit is contained in:
Thomas Haller
2015-03-19 16:28:59 +01:00
parent 5e962bef87
commit b5ca5bd7b7
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main-utils.c
View File

@@ -183,6 +183,8 @@ nm_main_utils_early_setup (const char *progname,
GError *error = NULL; GError *error = NULL;
gboolean success = FALSE; gboolean success = FALSE;
int i; int i;
const char *opt_fmt_log_level = NULL, *opt_fmt_log_domains = NULL;
const char **opt_loc_log_level = NULL, **opt_loc_log_domains = NULL;
/* Make GIO ignore the remote VFS service; otherwise it tries to use the /* Make GIO ignore the remote VFS service; otherwise it tries to use the
* session bus to contact the remote service, and NM shouldn't ever be * session bus to contact the remote service, and NM shouldn't ever be
@@ -207,11 +209,16 @@ nm_main_utils_early_setup (const char *progname,
} }
for (i = 0; options[i].long_name; i++) { for (i = 0; options[i].long_name; i++) {
if (!strcmp (options[i].long_name, "log-level")) if (!strcmp (options[i].long_name, "log-level")) {
opt_fmt_log_level = options[i].description;
opt_loc_log_level = &options[i].description;
options[i].description = g_strdup_printf (options[i].description, nm_logging_all_levels_to_string ()); options[i].description = g_strdup_printf (options[i].description, nm_logging_all_levels_to_string ());
else if (!strcmp (options[i].long_name, "log-domains")) } else if (!strcmp (options[i].long_name, "log-domains")) {
opt_fmt_log_domains = options[i].description;
opt_loc_log_domains = &options[i].description;
options[i].description = g_strdup_printf (options[i].description, nm_logging_all_domains_to_string ()); options[i].description = g_strdup_printf (options[i].description, nm_logging_all_domains_to_string ());
} }
}
/* Parse options */ /* Parse options */
opt_ctx = g_option_context_new (NULL); opt_ctx = g_option_context_new (NULL);
@@ -231,6 +238,15 @@ nm_main_utils_early_setup (const char *progname,
} }
g_option_context_free (opt_ctx); g_option_context_free (opt_ctx);
if (opt_loc_log_level) {
g_free ((char *) *opt_loc_log_level);
*opt_loc_log_level = opt_fmt_log_level;
}
if (opt_loc_log_domains) {
g_free ((char *) *opt_loc_log_domains);
*opt_loc_log_domains = opt_fmt_log_domains;
}
return success; return success;
} }