[or-cvs] [tor/master] Fix two memory leaks found by Coverity (CIDs 417-418)

[Nick Mathewson]

Author: Nick Mathewson <nickm at torproject.org>
Date: Mon, 26 Oct 2009 22:12:40 -0400
Subject: Fix two memory leaks found by Coverity (CIDs 417-418)
Commit: 5c73da7faad1537f63c0f9923a25f3dda9df0de1

The first happens on an error case when a controller wants an
impossible directory object.  The second happens when we can't write
our fingerprint file.
---
 src/or/control.c |    1 +
 src/or/router.c  |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/or/control.c b/src/or/control.c
index 5688b8e..f0178d7 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -1536,6 +1536,7 @@ getinfo_helper_dir(control_connection_t *control_conn,
     if (res) {
       log_warn(LD_CONTROL, "getinfo '%s': %s", question, msg);
       smartlist_free(descs);
+      tor_free(url);
       return -1;
     }
     SMARTLIST_FOREACH(descs, signed_descriptor_t *, sd,
diff --git a/src/or/router.c b/src/or/router.c
index fcfbe79..dab4cb8 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -588,6 +588,7 @@ init_keys(void)
     if (write_str_to_file(keydir, fingerprint_line, 0)) {
       log_err(LD_FS, "Error writing fingerprint line to file");
       tor_free(keydir);
+      tor_free(cp);
       return -1;
     }
   }
-- 
1.5.6.5