summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2006-06-09 06:54:02 +0000
committerRoger Dingledine <arma@torproject.org>2006-06-09 06:54:02 +0000
commitfd000f5f97d47594b6f9ea7fde64c414bd362626 (patch)
treee3b62bed2402194b344aed34e88da8ab06cf0c2f /src
parentf2fb54d0dc1722bf953be9725d050f065552dfa9 (diff)
downloadtor-fd000f5f97d47594b6f9ea7fde64c414bd362626.tar.gz
tor-fd000f5f97d47594b6f9ea7fde64c414bd362626.zip
backport the bandaid for bug 222, while we're at it.
svn:r6574
Diffstat (limited to 'src')
-rw-r--r--src/common/log.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/common/log.c b/src/common/log.c
index 2cdd8e86cd..677cb5241c 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -339,8 +339,10 @@ delete_log(logfile_t *victim)
logfiles = victim->next;
else {
for (tmpl = logfiles; tmpl && tmpl->next != victim; tmpl=tmpl->next) ;
- tor_assert(tmpl);
- tor_assert(tmpl->next == victim);
+// tor_assert(tmpl);
+// tor_assert(tmpl->next == victim);
+ if (!tmpl)
+ return;
tmpl->next = victim->next;
}
tor_free(victim->filename);