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

Use uint64_t for total length of dumped descriptors, nad be careful about overflows in the loop in dump_desc_fifo_add_and_clean()

Browse Source
This commit is contained in:
Andrea Shepard 2016-06-29 22:40:28 +00:00
parent 824ee581b0
commit 603f483092
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/or/routerparse.c
View File

@ -590,7 +590,7 @@ static int check_signature_token(const char *digest,
/** List of dumped descriptors for FIFO cleanup purposes */ /** List of dumped descriptors for FIFO cleanup purposes */
STATIC smartlist_t *descs_dumped = NULL; STATIC smartlist_t *descs_dumped = NULL;
/** Total size of dumped descriptors for FIFO cleanup */ /** Total size of dumped descriptors for FIFO cleanup */
STATIC size_t len_descs_dumped = 0; STATIC uint64_t len_descs_dumped = 0;
/* /*
* One entry in the list of dumped descriptors; filename dumped to, length * One entry in the list of dumped descriptors; filename dumped to, length
@ -614,7 +614,7 @@ dump_desc_fifo_add_and_clean(char *filename, const uint8_t *digest_sha256,
size_t len) size_t len)
{ {
dumped_desc_t *ent = NULL, *tmp; dumped_desc_t *ent = NULL, *tmp;
size_t max_len; uint64_t max_len;
tor_assert(filename != NULL); tor_assert(filename != NULL);
tor_assert(digest_sha256 != NULL); tor_assert(digest_sha256 != NULL);
@ -635,7 +635,7 @@ dump_desc_fifo_add_and_clean(char *filename, const uint8_t *digest_sha256,
/* Do we need to do some cleanup? */ /* Do we need to do some cleanup? */
max_len = get_options()->MaxUnparseableDescSizeToLog; max_len = get_options()->MaxUnparseableDescSizeToLog;
/* Iterate over the list until we've freed enough space */ /* Iterate over the list until we've freed enough space */
while (len_descs_dumped + len > max_len && while (len > max_len - len_descs_dumped &&
smartlist_len(descs_dumped) > 0) { smartlist_len(descs_dumped) > 0) {
/* Get the oldest thing on the list */ /* Get the oldest thing on the list */
tmp = (dumped_desc_t *)(smartlist_get(descs_dumped, 0)); tmp = (dumped_desc_t *)(smartlist_get(descs_dumped, 0));