diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-07-12 16:17:25 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-07-12 16:17:25 +0000 |
| commit | fef206a7d1bbe6d85b54dc59ca2012d646ea5b08 (patch) | |
| tree | 30fad4c10a47bcb6c50c2bd2b71a9bf4c01d501f | |
| parent | 25e312e1a36e55257a71189bdbe786111622397d (diff) | |
| download | tor-fef206a7d1bbe6d85b54dc59ca2012d646ea5b08.tar.gz tor-fef206a7d1bbe6d85b54dc59ca2012d646ea5b08.zip | |
r13715@catbus: nickm | 2007-07-12 12:11:09 -0400
Partial backport of r10376, just in case it was important.
svn:r10808
| -rw-r--r-- | doc/TODO.012 | 2 | ||||
| -rw-r--r-- | src/or/directory.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/TODO.012 b/doc/TODO.012 index 860b26d1e9..61bf76e23f 100644 --- a/doc/TODO.012 +++ b/doc/TODO.012 @@ -3,7 +3,7 @@ Backport items for 0.1.2: 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 (??) diff --git a/src/or/directory.c b/src/or/directory.c index 974e92583d..6bed668ea5 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1853,7 +1853,7 @@ directory_handle_command_post(dir_connection_t *conn, const char *headers, 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) |