nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make CONSENSUS_LINE_MAX_LEN a real define

Browse Source
This commit is contained in:
Nick Mathewson 2017-03-15 16:43:24 -04:00
parent 5e81436428
commit 83049cebc0
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/or/consdiff.c
View File

@ -1139,6 +1139,9 @@ consdiff_apply_diff(const smartlist_t *cons1,
return cons2_str; return cons2_str;
} }
/** Any consensus line longer than this means that the input is invalid. */
#define CONSENSUS_LINE_MAX_LEN (1<<20)
/** /**
* Helper: For every NL-terminated line in <b>s</b>, add a cdline referring to * Helper: For every NL-terminated line in <b>s</b>, add a cdline referring to
* that line (without trailing newline) to <b>out</b>. Return -1 if there are * that line (without trailing newline) to <b>out</b>. Return -1 if there are
@ -1160,7 +1163,7 @@ consensus_split_lines(smartlist_t *out, const char *s, memarea_t *area)
/* File doesn't end with newline. */ /* File doesn't end with newline. */
return -1; return -1;
} }
if (eol - s > UINT32_MAX) { if (eol - s > CONSENSUS_LINE_MAX_LEN) {
/* Line is far too long. */ /* Line is far too long. */
return -1; return -1;
} }