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

Use 25% less RAM for base64-encoded directory objects

Browse Source 
We were allocating N bytes to decode an N-byte base64 encoding,
when 3N/4 would have been enough.
This commit is contained in:
Nick Mathewson 2018-12-14 13:11:58 -05:00
parent 3c35c0d441
commit 6dc90d290d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/feature/dirparse/parsecommon.c
View File

@ -393,8 +393,9 @@ get_next_token(memarea_t *area,
RET_ERR("Couldn't parse private key.");
} else { /* If it's something else, try to base64-decode it */
int r;
tok->object_body = ALLOC(next-*s); /* really, this is too much RAM. */
r = base64_decode(tok->object_body, next-*s, *s, next-*s);
size_t maxsize = base64_decode_maxsize(next-*s);
tok->object_body = ALLOC(maxsize);
r = base64_decode(tok->object_body, maxsize, *s, next-*s);
if (r<0)
RET_ERR("Malformed object: bad base64-encoded data");
tok->object_size = r;