[or-cvs] r10808: Partial backport of r10376, just in case it was important. (in tor/branches/tor-0_1_2-patches: . doc src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-07-12 12:17:25 -0400 (Thu, 12 Jul 2007)
New Revision: 10808

Modified:
   tor/branches/tor-0_1_2-patches/
   tor/branches/tor-0_1_2-patches/doc/TODO.012
   tor/branches/tor-0_1_2-patches/src/or/directory.c
Log:
 r13715 at catbus:  nickm | 2007-07-12 12:11:09 -0400
 Partial backport of r10376, just in case it was important.



Property changes on: tor/branches/tor-0_1_2-patches
___________________________________________________________________
 svk:merge ticket from /tor/012 [r13715] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/branches/tor-0_1_2-patches/doc/TODO.012
===================================================================
--- tor/branches/tor-0_1_2-patches/doc/TODO.012	2007-07-12 16:17:23 UTC (rev 10807)
+++ tor/branches/tor-0_1_2-patches/doc/TODO.012	2007-07-12 16:17:25 UTC (rev 10808)
@@ -3,7 +3,7 @@
   o r10240,10242: avoid choosing family of exit as guard.
   o r10248: handle lack of nul at end of mmaped data.
   - r10346: Try even harder not to look at the first byte after an mmap.
-  - r10376, r10396: Fix segfaults in directory code
+  o r10376, r10396: Fix segfaults in directory code
   - r10478: stop tearing down entire circuits because the user asked for
 	    a nonexistent hidden service port
   - r10493: weight guard selection by bandwidth (??)

Modified: tor/branches/tor-0_1_2-patches/src/or/directory.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/directory.c	2007-07-12 16:17:23 UTC (rev 10807)
+++ tor/branches/tor-0_1_2-patches/src/or/directory.c	2007-07-12 16:17:25 UTC (rev 10808)
@@ -1853,7 +1853,7 @@
   log_debug(LD_DIRSERV,"rewritten url as '%s'.", url);
 
   if (!strcmp(url,"/tor/")) { /* server descriptor post */
-    const char *msg;
+    const char *msg = NULL;
     int r = dirserv_add_descriptor(body, &msg);
     tor_assert(msg);
     if (r > 0)