[tor/master] Fix a bug in earlier torcert fix, fix another.

commit 49c31877b6dd75c268898849941ae44056bf42df Author: Nick Mathewson <nickm@torproject.org> Date: Thu May 28 13:14:30 2015 -0400 Fix a bug in earlier torcert fix, fix another. --- src/or/torcert.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/or/torcert.c b/src/or/torcert.c index 095cbb8..838501e 100644 --- a/src/or/torcert.c +++ b/src/or/torcert.c @@ -68,13 +68,15 @@ tor_cert_sign_impl(const ed25519_keypair_t *signing_key, tor_free(encoded); - return torcert; + goto done; err: tor_cert_free(torcert); + torcert = NULL; + done: ed25519_cert_free(cert); tor_free(encoded); - return NULL; + return torcert; } /** @@ -151,7 +153,7 @@ tor_cert_parse(const uint8_t *encoded, const size_t len) cert = NULL; done: ed25519_cert_free(parsed); - return NULL; + return cert; } /** Fill in <b>checkable_out</b> with the information needed to check
participants (1)
-
nickm@torproject.org