[or-cvs] r11250: backport r11249 (in tor/branches/tor-0_1_2-patches: . src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2007-08-21 23:22:51 -0400 (Tue, 21 Aug 2007)
New Revision: 11250

Modified:
   tor/branches/tor-0_1_2-patches/ChangeLog
   tor/branches/tor-0_1_2-patches/src/or/routerparse.c
Log:
backport r11249


Modified: tor/branches/tor-0_1_2-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_2-patches/ChangeLog	2007-08-22 03:21:51 UTC (rev 11249)
+++ tor/branches/tor-0_1_2-patches/ChangeLog	2007-08-22 03:22:51 UTC (rev 11250)
@@ -45,6 +45,8 @@
       from tup.
     - Fix a minor memory leak when we fail to find enough suitable
       servers to choose a circuit.
+    - Stop leaking part of the descriptor when we run into a particularly
+      unparseable piece of it.
 
 
 Changes in version 0.1.2.16 - 2007-08-01

Modified: tor/branches/tor-0_1_2-patches/src/or/routerparse.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/routerparse.c	2007-08-22 03:21:51 UTC (rev 11249)
+++ tor/branches/tor-0_1_2-patches/src/or/routerparse.c	2007-08-22 03:22:51 UTC (rev 11250)
@@ -1747,6 +1747,7 @@
     tok = get_next_token(s, where);
     if (tok->tp == _ERR) {
       log_warn(LD_DIR, "parse error: %s", tok->error);
+      token_free(tok);
       return -1;
     }
     smartlist_add(out, tok);