Commit 281854ba authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

If options_act() fails, restore the previous value of global_options 

Before 0.3.3.1-alpha, we would exit() in this case immediately.  But
now that we leave tor_main() more conventionally, we need to make
sure we restore things so as not to cause a double free.

Fixes bug 27708; bugfix on 0.3.3.1-alpha.
parent 7c26f88f

changes/bug27708

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Major bugfixes (restart-in-process):

    - Fix a use-after-free error that could be caused by passing Tor an

      impossible set of options that would fail during options_act().

      Fixes bug 27708; bugfix on 0.3.3.1-alpha.

src/or/config.c

+1 −0
Original line number Diff line number Diff line
@@ -868,6 +868,7 @@ set_options(or_options_t *new_val, char **msg) 
              "Acting on config options left us in a broken state. Dying.");

      tor_shutdown_event_loop_and_exit(1);

    }

    global_options = old_options;

    return -1;

  }

  /* Issues a CONF_CHANGED event to notify controller of the change. If Tor is