diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-05-29 14:41:20 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-05-29 14:41:20 +0000 |
| commit | 63035cdb3362ea46d2821d5f5604f1cf7b930dd4 (patch) | |
| tree | 949503184720c7a949be1bf2c56a105a01e6bbec | |
| parent | d509efb9b789817d3222ef6fdad33e7e1fb61339 (diff) | |
| download | tor-63035cdb3362ea46d2821d5f5604f1cf7b930dd4.tar tor-63035cdb3362ea46d2821d5f5604f1cf7b930dd4.tar.gz | |
r13041@catbus: nickm | 2007-05-29 10:40:05 -0400
More messing around to try to address possible root causes of bug 436.
svn:r10388
| -rw-r--r-- | src/or/dirserv.c | 1 | ||||
| -rw-r--r-- | src/or/routerlist.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index fb2dc6dc5..cdbb39088 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -523,6 +523,7 @@ dirserv_add_multiple_descriptors(const char *desc, const char **msg) smartlist_t *list; const char *s; int n_parsed = 0; + tor_assert(msg); s = desc; list = smartlist_create(); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 858e9ff96..a92bbe61d 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2462,7 +2462,7 @@ router_add_extrainfo_to_routerlist(extrainfo_t *ei, const char **msg, { int inserted; (void)from_fetch; - (void)msg; + if (msg) *msg = NULL; inserted = extrainfo_insert(router_get_routerlist(), ei); |