Free very-old descriptors that we do not want to add. [Backport]

svn:r19059

2 files changed, 8 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index acb8a6a9a3..46e58f2301 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Changes in version 0.3.0.35 - 2009-??-??
+  o Minor bugfixes:
+    - When starting with a cache over a few days old, do not leak
+      memory for the obsolete router descriptors in it.  Bugfix on
+      0.2.1.11-alpha; fixes bug 672.
+
+
 Changes in version 0.2.0.34 - 2009-02-08
   Tor 0.2.0.34 features several more security-related fixes. You should
   upgrade, especially if you run an exit relay (remote crash) or a
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 01169d2c58..6aff74084f 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -2867,6 +2867,7 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg,
   if (!in_consensus && from_cache &&
       router->cache_info.published_on < time(NULL) - OLD_ROUTER_DESC_MAX_AGE) {
     *msg = "Router descriptor was really old.";
+    routerinfo_free(router);
     return -1;
   }