[or-cvs] backport the bandaid for bug 222, while we"re at it.

arma at seul.org arma at seul.org
Fri Jun 9 06:54:04 UTC 2006


Update of /home/or/cvsroot/tor/src/common
In directory moria:/home/arma/work/onion/tor-011x/tor/src/common

Modified Files:
      Tag: tor-0_1_1-patches
	log.c 
Log Message:
backport the bandaid for bug 222, while we're at it.


Index: log.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/common/log.c,v
retrieving revision 1.116
retrieving revision 1.116.2.1
diff -u -p -d -r1.116 -r1.116.2.1
--- log.c	13 Mar 2006 00:54:21 -0000	1.116
+++ log.c	9 Jun 2006 06:54:02 -0000	1.116.2.1
@@ -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);



More information about the tor-commits mailing list