backport r11249

svn:r11250

2 files changed, 3 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 058a71c77c..ac2a7daa8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,6 +45,8 @@ Changes in version 0.1.2.17 - 2007-08-xx
       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
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index ff6bff53b1..7862a07ae9 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -1747,6 +1747,7 @@ tokenize_string(const char *start, const char *end, smartlist_t *out,
     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);