[or-cvs] r19059: {tor} Free very-old descriptors that we do not want to add. [Backp (in tor/branches/tor-0_2_0-patches: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2009-03-16 14:48:09 -0400 (Mon, 16 Mar 2009)
New Revision: 19059

Modified:
   tor/branches/tor-0_2_0-patches/ChangeLog
   tor/branches/tor-0_2_0-patches/src/or/routerlist.c
Log:
Free very-old descriptors that we do not want to add. [Backport]

Modified: tor/branches/tor-0_2_0-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_2_0-patches/ChangeLog	2009-03-16 18:48:06 UTC (rev 19058)
+++ tor/branches/tor-0_2_0-patches/ChangeLog	2009-03-16 18:48:09 UTC (rev 19059)
@@ -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

Modified: tor/branches/tor-0_2_0-patches/src/or/routerlist.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/or/routerlist.c	2009-03-16 18:48:06 UTC (rev 19058)
+++ tor/branches/tor-0_2_0-patches/src/or/routerlist.c	2009-03-16 18:48:09 UTC (rev 19059)
@@ -2867,6 +2867,7 @@
   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;
   }