From ee9cc158ba082676a710bc755c02b9120dd4be13 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Wed, 22 Aug 2007 03:22:51 +0000 Subject: [PATCH] backport r11249 svn:r11250 --- ChangeLog | 2 ++ src/or/routerparse.c | 1 + 2 files changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index 058a71c77..ac2a7daa8 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 ff6bff53b..7862a07ae 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);