Commit 52fd384a authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge remote-tracking branch 'origin/maint-0.2.7'

parents f41be5f9 9c4a0aef

changes/bug17403

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (memory leaks):

    - Fix a memory leak when reading an expired signing key from disk.

      Fixes bug 17403; bugfix on 0.2.7.2-rc.

src/or/routerkeys.c

+2 −0
Original line number Diff line number Diff line
@@ -836,6 +836,8 @@ load_ed_keys(const or_options_t *options, time_t now) 
                      INIT_ED_KEY_INCLUDE_SIGNING_KEY_IN_CERT);

    char *fname =

      options_get_datadir_fname2(options, "keys", "ed25519_signing");

    ed25519_keypair_free(sign);

    tor_cert_free(sign_cert);

    sign = ed_key_init_from_file(fname,

                                 flags, LOG_WARN,

                                 sign_signing_key_with_id, now,