Browse Source

Use 25% less RAM for base64-encoded directory objects

We were allocating N bytes to decode an N-byte base64 encoding,
when 3N/4 would have been enough.
Nick Mathewson 6 years ago
parent
commit
6dc90d290d
1 changed files with 3 additions and 2 deletions
  1. 3 2
      src/feature/dirparse/parsecommon.c

+ 3 - 2
src/feature/dirparse/parsecommon.c

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