1 files changed, 25 insertions, 21 deletions

diff --git a/src/or/config.c b/src/or/config.c
index ae10ed7b36..0f63cf8b8e 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -827,8 +827,8 @@ set_options(or_options_t *new_val, char **msg)
             "Acting on config options left us in a broken state. Dying.");
     exit(1);
   }
-  if (old_options)
-    config_free(&options_format, old_options);
+
+  config_free(&options_format, old_options);
 
   return 0;
 }
@@ -859,8 +859,10 @@ get_version(void)
 static void
 or_options_free(or_options_t *options)
 {
-  if (options->_ExcludeExitNodesUnion)
-    routerset_free(options->_ExcludeExitNodesUnion);
+  if (!options)
+    return;
+
+  routerset_free(options->_ExcludeExitNodesUnion);
   config_free(&options_format, options);
 }
 
@@ -869,18 +871,15 @@ or_options_free(or_options_t *options)
 void
 config_free_all(void)
 {
-  if (global_options) {
-    or_options_free(global_options);
-    global_options = NULL;
-  }
-  if (global_state) {
-    config_free(&state_format, global_state);
-    global_state = NULL;
-  }
-  if (global_cmdline_options) {
-    config_free_lines(global_cmdline_options);
-    global_cmdline_options = NULL;
-  }
+  or_options_free(global_options);
+  global_options = NULL;
+
+  config_free(&state_format, global_state);
+  global_state = NULL;
+
+  config_free_lines(global_cmdline_options);
+  global_cmdline_options = NULL;
+
   tor_free(torrc_fname);
   tor_free(_version);
   tor_free(global_dirfrontpagecontents);
@@ -1608,7 +1607,10 @@ config_get_commandlines(int argc, char **argv, config_line_t **result)
     *new = tor_malloc_zero(sizeof(config_line_t));
     s = argv[i];
 
-    while (*s == '-')
+    /* Each keyword may be prefixed with one or two dashes. */
+    if (*s == '-')
+      s++;
+    if (*s == '-')
       s++;
 
     (*new)->key = tor_strdup(expand_abbrev(&options_format, s, 1, 1));
@@ -2641,7 +2643,10 @@ config_free(config_format_t *fmt, void *options)
 {
   int i;
 
-  tor_assert(options);
+  if (!options)
+    return;
+
+  tor_assert(fmt);
 
   for (i=0; fmt->vars[i].name; ++i)
     option_clear(fmt, options, &(fmt->vars[i]));
@@ -2870,7 +2875,7 @@ config_dump(config_format_t *fmt, void *options, int minimal,
  * the configuration in <b>options</b>.  If <b>minimal</b> is true, do not
  * include options that are the same as Tor's defaults.
  */
-static char *
+char *
 options_dump(or_options_t *options, int minimal)
 {
   return config_dump(&options_format, options, minimal, 0);
@@ -5130,8 +5135,7 @@ or_state_set(or_state_t *new_state)
 {
   char *err = NULL;
   tor_assert(new_state);
-  if (global_state)
-    config_free(&state_format, global_state);
+  config_free(&state_format, global_state);
   global_state = new_state;
   if (entry_guards_parse_state(global_state, 1, &err)<0) {
     log_warn(LD_GENERAL,"%s",err);