aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2019-05-15 13:46:20 +0300
committerGeorge Kadianakis <desnacked@riseup.net>2019-05-15 13:46:20 +0300
commit1de11dc47a81913cf32e7c40834869631c18ba3d (patch)
treed2b9e11805788dbeea3e2b10f78e774006440b12 /src
parent43d41194546dbf6a634648d592e97ccd10b04fda (diff)
parentcd264e145b0b3518f46e471ecd9228921ee46ab6 (diff)
downloadtor-1de11dc47a81913cf32e7c40834869631c18ba3d.tar.gz
tor-1de11dc47a81913cf32e7c40834869631c18ba3d.zip
Merge branch 'maint-0.4.0'
Diffstat (limited to 'src')
-rw-r--r--src/feature/hs/hs_service.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c
index 0e145524a1..76e55e4f83 100644
--- a/src/feature/hs/hs_service.c
+++ b/src/feature/hs/hs_service.c
@@ -1229,16 +1229,16 @@ load_client_keys(hs_service_t *service)
client_key_file_path = hs_path_from_filename(client_keys_dir_path,
filename);
client_key_str = read_file_to_str(client_key_file_path, 0, NULL);
- /* Free immediately after using it. */
- tor_free(client_key_file_path);
/* If we cannot read the file, continue with the next file. */
if (!client_key_str) {
log_warn(LD_REND, "Client authorization file %s can't be read. "
"Corrupted or verify permission? Ignoring.",
client_key_file_path);
+ tor_free(client_key_file_path);
continue;
}
+ tor_free(client_key_file_path);
client = parse_authorized_client(client_key_str);
/* Wipe and free immediately after using it. */