[or-cvs] r11249: backport candidate: Stop leaking part of the descriptor when (in tor/trunk: . src/or)

[arma at seul.org]

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

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/routerparse.c
Log:
backport candidate:
Stop leaking part of the descriptor when we run into a particularly
unparseable piece of it. Bugfix on 0.1.2.x.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-08-22 03:04:09 UTC (rev 11248)
+++ tor/trunk/ChangeLog	2007-08-22 03:21:51 UTC (rev 11249)
@@ -26,6 +26,8 @@
       new CookieAuthFile option. Reported by Matt Edman.
     - Fix a minor memory leak when we fail to find enough suitable
       servers to choose a circuit. Bugfix on 0.1.2.x.
+    - Stop leaking part of the descriptor when we run into a particularly
+      unparseable piece of it. Bugfix on 0.1.2.x.
 
   o Minor features (misc):
     - Optionally (if built with -DEXPORTMALLINFO) export the output

Modified: tor/trunk/src/or/routerparse.c
===================================================================
--- tor/trunk/src/or/routerparse.c	2007-08-22 03:04:09 UTC (rev 11248)
+++ tor/trunk/src/or/routerparse.c	2007-08-22 03:21:51 UTC (rev 11249)
@@ -2650,6 +2650,7 @@
     tok = get_next_token(s, end, table);
     if (tok->tp == _ERR) {
       log_warn(LD_DIR, "parse error: %s", tok->error);
+      token_free(tok);
       return -1;
     }
     ++counts[tok->tp];