commit 951d59d706f116cbfa3d3700d9b342a736a571b2 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jul 10 10:32:09 2018 -0400 Use tor_getline() in dirserv.c to remove its upper line limit. Closes ticket 26223. --- changes/bug26223 | 3 +++ src/feature/dircache/dirserv.c | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/changes/bug26223 b/changes/bug26223 new file mode 100644 index 000000000..e17b0529e --- /dev/null +++ b/changes/bug26223 @@ -0,0 +1,3 @@ + o Minor features (directory authority): + - There is no longer an artificial upper limit on the length of bandwidth + lines. Closes ticket 26223. diff --git a/src/feature/dircache/dirserv.c b/src/feature/dircache/dirserv.c index 50869c2b9..57de6ab8e 100644 --- a/src/feature/dircache/dirserv.c +++ b/src/feature/dircache/dirserv.c @@ -2606,7 +2606,6 @@ int dirserv_read_measured_bandwidths(const char *from_file, smartlist_t *routerstatuses) { - char line[512]; FILE *fp = tor_fopen_cloexec(from_file, "r"); int applied_lines = 0; time_t file_time, now; @@ -2617,9 +2616,10 @@ dirserv_read_measured_bandwidths(const char *from_file, * version 1.1.0 */ int line_is_after_headers = 0; int rv = -1; + char *line = NULL; + size_t n = 0; /* Initialise line, so that we can't possibly run off the end. */ - memset(line, 0, sizeof(line)); if (fp == NULL) { log_warn(LD_CONFIG, "Can't open bandwidth file at configured location: %s", @@ -2628,7 +2628,7 @@ dirserv_read_measured_bandwidths(const char *from_file, } /* If fgets fails, line is either unmodified, or indeterminate. */ - if (!fgets(line, sizeof(line), fp)) { + if (tor_getline(&line,&n,fp) <= 0) { log_warn(LD_DIRSERV, "Empty bandwidth file"); goto err; } @@ -2659,7 +2659,7 @@ dirserv_read_measured_bandwidths(const char *from_file, while (!feof(fp)) { measured_bw_line_t parsed_line; - if (fgets(line, sizeof(line), fp) && strlen(line)) { + if (tor_getline(&line, &n, fp) >= 0) { if (measured_bw_line_parse(&parsed_line, line, line_is_after_headers) != -1) { /* This condition will be true when the first complete valid bw line @@ -2682,6 +2682,8 @@ dirserv_read_measured_bandwidths(const char *from_file, rv = 0; err: + if (line) + raw_free(line); if (fp) fclose(fp); return rv;