1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index dccb9f463..f269b5496 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -158,6 +158,11 @@ void add_nickname_list_to_smartlist(smartlist_t *sl, const char *list) {
   start = list;
   while(*start) {
     end=start; while(*end && !isspace((int)*end) && *end != ',') end++;
+    if (end-start > MAX_HEX_NICKNAME_LEN) {
+      log_fn(LOG_WARN,"Nickname too long; skipping");
+      start = end;
+      continue;
+    }
     memcpy(nick,start,end-start);
     nick[end-start] = 0; /* null terminate it */
     router = router_get_by_nickname(nick);