Commit d1c7f65a authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge branch 'bug3135' into maint-0.2.1

parents e7b10e5e 13847b8d

changes/bug3135

0 → 100644
+6 −0
Original line number Diff line number Diff line 
  o Minor bugfixes

    - Do not crash when our configuration file becomes unreadable

      (usually due to a permissions change) between when we start

      up and when a controller calls SAVECONF.  Fixes bug 3135;

      bugfix on 0.0.9pre6.

src/or/config.c

+1 −1
Original line number Diff line number Diff line
@@ -4625,7 +4625,7 @@ write_configuration_file(const char *fname, or_options_t *options) 
  switch (file_status(fname)) {

    case FN_FILE:

      old_val = read_file_to_str(fname, 0, NULL);

      if (strcmpstart(old_val, GENERATED_FILE_PREFIX)) {

      if (!old_val || strcmpstart(old_val, GENERATED_FILE_PREFIX)) {

        rename_old = 1;

      }

      tor_free(old_val);