nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use tor_getline() in dirserv.c to remove its upper line limit.

Browse Source 
Closes ticket 26223.
This commit is contained in:
Nick Mathewson 2018-07-10 10:32:09 -04:00
parent 6574d4bd27
commit 951d59d706
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug26223 Normal file
View File

@ -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.

10
src/feature/dircache/dirserv.c
View File

@ -2606,7 +2606,6 @@ int
dirserv_read_measured_bandwidths(const char *from_file, dirserv_read_measured_bandwidths(const char *from_file,
smartlist_t *routerstatuses) smartlist_t *routerstatuses)
{ {
char line[512];
FILE *fp = tor_fopen_cloexec(from_file, "r"); FILE *fp = tor_fopen_cloexec(from_file, "r");
int applied_lines = 0; int applied_lines = 0;
time_t file_time, now; time_t file_time, now;
@ -2617,9 +2616,10 @@ dirserv_read_measured_bandwidths(const char *from_file,
* version 1.1.0 */ * version 1.1.0 */
int line_is_after_headers = 0; int line_is_after_headers = 0;
int rv = -1; int rv = -1;
char *line = NULL;
size_t n = 0;
/* Initialise line, so that we can't possibly run off the end. */ /* Initialise line, so that we can't possibly run off the end. */
memset(line, 0, sizeof(line));
if (fp == NULL) { if (fp == NULL) {
log_warn(LD_CONFIG, "Can't open bandwidth file at configured location: %s", 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 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"); log_warn(LD_DIRSERV, "Empty bandwidth file");
goto err; goto err;
} }
@ -2659,7 +2659,7 @@ dirserv_read_measured_bandwidths(const char *from_file,
while (!feof(fp)) { while (!feof(fp)) {
measured_bw_line_t parsed_line; 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, if (measured_bw_line_parse(&parsed_line, line,
line_is_after_headers) != -1) { line_is_after_headers) != -1) {
/* This condition will be true when the first complete valid bw line /* 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; rv = 0;
err: err:
if (line)
raw_free(line);
if (fp) if (fp)
fclose(fp); fclose(fp);
return rv; return rv;