torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix seg faults when router_load_single_router fails

Browse Source 
svn:r4265
This commit is contained in:
Roger Dingledine
2005-05-18 03:42:46 +00:00
parent e7354725bb
commit fe78aac027
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/routerlist.c
+3 -3
View File
@@ -916,13 +916,13 @@ router_load_single_router(const char *s, const char **msg)
}
if (router_is_me(ri)) {
log_fn(LOG_WARN, "Router's identity key matches mine; dropping.");
if (msg && !*msg) *msg = "Router's identity key matches mine.";
if (msg) *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) *msg = "Couldn't resolve router address.";
if (msg) *msg = "Couldn't resolve router address.";
routerinfo_free(ri);
return 0;
}
@@ -934,7 +934,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) *msg = "Couldn't add router to list.";
if (msg) *msg = "Couldn't add router to list.";
/* ri is already freed */
return 0;
} else {