diff options
Diffstat (limited to 'src/or/routerlist.c')
| -rw-r--r-- | src/or/routerlist.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 6743e1528..44aa8123b 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -908,21 +908,22 @@ int router_load_single_router(const char *s, const char **msg) { routerinfo_t *ri; + tor_assert(msg); if (!(ri = router_parse_entry_from_string(s, NULL))) { log_fn(LOG_WARN, "Error parsing router descriptor; dropping."); - if (msg) *msg = "Couldn't parse router descriptor"; + *msg = "Couldn't parse router descriptor"; return -1; } if (router_is_me(ri)) { log_fn(LOG_WARN, "Router's identity key matches mine; dropping."); - if (msg) *msg = "Router's identity key matches mine."; + *msg = "Router's identity key matches mine."; routerinfo_free(ri); return 0; } if (router_resolve(ri)<0) { log_fn(LOG_WARN, "Couldn't resolve router address; dropping."); - if (msg) *msg = "Couldn't resolve router address."; + *msg = "Couldn't resolve router address."; routerinfo_free(ri); return 0; } @@ -934,7 +935,7 @@ router_load_single_router(const char *s, const char **msg) } if (router_add_to_routerlist(ri, msg)<0) { log_fn(LOG_WARN, "Couldn't add router to list; dropping."); - if (msg) *msg = "Couldn't add router to list."; + *msg = "Couldn't add router to list."; /* ri is already freed */ return 0; } else { |