Commit 0f0dac0b authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'maint-0.3.3' into maint-0.3.4

parents aaa5ca36 c4d0d9bd

changes/bug26948

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

    - Always call tor_free_all() when leaving tor_run_main(). When we

      did not, restarting tor in-process would cause an assertion failure.

      Fixes bug 26948; bugfix on 0.3.3.1-alpha.

src/or/main.c

+5 −4
Original line number Diff line number Diff line
@@ -4246,10 +4246,10 @@ tor_run_main(const tor_main_configuration_t *tor_cfg) 
#endif /* defined(NT_SERVICE) */

  {

    int init_rv = tor_init(argc, argv);

    if (init_rv < 0)

      return -1;

    else if (init_rv > 0)

      return 0;

    if (init_rv) {

      tor_free_all(0);

      return (init_rv < 0) ? -1 : 0;

    }

  }



  if (get_options()->Sandbox && get_options()->command == CMD_RUN_TOR) {
@@ -4257,6 +4257,7 @@ tor_run_main(const tor_main_configuration_t *tor_cfg) 


    if (sandbox_init(cfg)) {

      log_err(LD_BUG,"Failed to create syscall sandbox filter");

      tor_free_all(0);

      return -1;

    }