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

fix some memory leaks that coverity found

Browse Source
This commit is contained in:
Nick Mathewson 2015-06-19 09:03:25 -04:00
parent 583a387c1e
commit 1edaef2adf
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/or/routerkeys.c
View File

@ -29,10 +29,11 @@ read_encrypted_secret_key(ed25519_secret_key_t *out,
sizeof(encrypted_key)); sizeof(encrypted_key));
if (encrypted_len < 0) { if (encrypted_len < 0) {
log_info(LD_OR, "%s is missing", fname); log_info(LD_OR, "%s is missing", fname);
return 0; r = 0;
goto done;
} }
if (strcmp(tag, ENC_KEY_TAG)) if (strcmp(tag, ENC_KEY_TAG))
return -1; goto done;
while (1) { while (1) {
ssize_t pwlen = ssize_t pwlen =
@ -64,6 +65,7 @@ read_encrypted_secret_key(ed25519_secret_key_t *out,
done: done:
memwipe(encrypted_key, 0, encrypted_len); memwipe(encrypted_key, 0, encrypted_len);
memwipe(pwbuf, 0, sizeof(pwbuf)); memwipe(pwbuf, 0, sizeof(pwbuf));
tor_free(tag);
if (secret) { if (secret) {
memwipe(secret, 0, secret_len); memwipe(secret, 0, secret_len);
tor_free(secret); tor_free(secret);
@ -498,6 +500,7 @@ load_ed_keys(const or_options_t *options, time_t now)
tor_free(fname); tor_free(fname);
goto err; goto err;
} }
tor_free(fname);
fname = options_get_datadir_fname2(options, "keys", "ed25519_master_id"); fname = options_get_datadir_fname2(options, "keys", "ed25519_master_id");
id = ed_key_init_from_file( id = ed_key_init_from_file(
fname, fname,