From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 7 May 2018 17:56:39 +0000 (-0400)
Subject: Avoid unsigned integer underflow on empty input.
X-Git-Tag: tor-0.3.4.1-alpha~45^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a17dc0875ad0d434d9cf66d36ed23fbd69286bf3;p=thirdparty%2Ftor.git

Avoid unsigned integer underflow on empty input.
---

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index d9a9b8522d..e47533759b 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -2641,6 +2641,12 @@ measured_bw_line_parse(measured_bw_line_t *out, const char *orig_line)
   int got_node_id = 0;
   char *strtok_state; /* lame sauce d'jour */
 
+  if (strlen(line) == 0) {
+    log_warn(LD_DIRSERV, "Empty line in bandwidth file");
+    tor_free(line);
+    return -1;
+  }
+
   /* Remove end of line character, so that is not part of the token */
   if (line[strlen(line) - 1] == '\n') {
     line[strlen(line) - 1] = '\0';