Prechádzať zdrojové kódy

Strip extra trailing newlines when parsing router descriptors.

svn:r5212
Nick Mathewson 20 rokov pred
rodič
commit
4c7113d26a
1 zmenil súbory, kde vykonal 4 pridanie a 0 odobranie
  1. 4 0
      src/or/routerparse.c

+ 4 - 0
src/or/routerparse.c

@@ -694,6 +694,10 @@ router_parse_entry_from_string(const char *s, const char *end)
     end = s + strlen(s);
   }
 
+  /* point 'end' to a point immediately after the final newline. */
+  while (end > s+2 && *(end-1) == '\n' && *(end-2) == '\n')
+    --end;
+
   if (router_get_router_hash(s, digest) < 0) {
     log_fn(LOG_WARN, "Couldn't compute router hash.");
     return NULL;