summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-01-14 19:00:19 +0000
committerNick Mathewson <nickm@torproject.org>2008-01-14 19:00:19 +0000
commite49229caf8645564646354c6f3670db2cab26583 (patch)
treed4bfc8e5ecfe272e04a0e2e769a5698b8b573444
parente1c97755176c521589063482b6bed8151124986f (diff)
downloadtor-e49229caf8645564646354c6f3670db2cab26583.tar.gz
tor-e49229caf8645564646354c6f3670db2cab26583.zip
r17610@catbus: nickm | 2008-01-14 13:20:49 -0500
Fix a bogus free() call on a base64 failure in router_append_dirobj_signature(). svn:r13129
-rw-r--r--ChangeLog1
-rw-r--r--src/or/routerparse.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bd0e01bdcb..3d92b226c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,7 @@ Changes in version 0.2.0.16-alpha - 2008-01-??
- Do not try to download missing certificates until we have tried
to check our fallback consensus. Fixes bug 583.
- Make bridges round geoip info up, not down.
+ - Avoid a spurious free on base64 failure. Bugfix on 0.1.2.
o Minor features (controller):
- Get NS events working again. (Patch from tup)
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index e57077d660..102bae7641 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -521,7 +521,6 @@ router_append_dirobj_signature(char *buf, size_t buf_len, const char *digest,
i = strlen(buf);
if (base64_encode(buf+i, buf_len-i, signature, 128) < 0) {
log_warn(LD_BUG,"couldn't base64-encode signature");
- tor_free(buf);
goto err;
}