[or-cvs] r9648: Fix a bug in 9572: after we decref a defunct v1 directory, d (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-02-24 18:55:36 -0500 (Sat, 24 Feb 2007)
New Revision: 9648

Modified:
   tor/trunk/
   tor/trunk/src/or/dirserv.c
Log:
 r11933@catbus:  nickm | 2007-02-24 18:55:33 -0500
 Fix a bug in 9572: after we decref a defunct v1 directory, drop the main reference to it.  Should fix bug 396.  Many thanks to seeess for tracking this one down.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r11933] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/dirserv.c
===================================================================
--- tor/trunk/src/or/dirserv.c	2007-02-24 21:21:38 UTC (rev 9647)
+++ tor/trunk/src/or/dirserv.c	2007-02-24 23:55:36 UTC (rev 9648)
@@ -1153,6 +1153,7 @@
   if (cached_directory &&
       cached_directory->published < (now - MAX_V1_DIRECTORY_AGE)) {
     cached_dir_decref(cached_directory);
+    cached_directory = NULL;
   }
   if (cached_runningrouters.published < (now - MAX_V1_RR_AGE)) {
     clear_cached_dir(&cached_runningrouters);