diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-06-29 00:43:59 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-06-29 00:43:59 -0400 |
| commit | ed2601f2be0978c37c0ae086b2a8d2f7d94078fc (patch) | |
| tree | 791b0f0bd0b1f1864e94cd1d7b7fc098764dc52a | |
| parent | 630677f339dda6fbb720380d42cfe247b85eb1a8 (diff) | |
| parent | 6abdcdf11641b9d7e84d438ece781dcfb689a705 (diff) | |
| download | tor-ed2601f2be0978c37c0ae086b2a8d2f7d94078fc.tar.gz tor-ed2601f2be0978c37c0ae086b2a8d2f7d94078fc.zip | |
Merge branch 'bug6255'
| -rw-r--r-- | src/or/rendservice.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 8acc226e3a..689cfb1646 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -724,7 +724,6 @@ rend_service_load_auth_keys(rend_service_t *s, const char *hfname) } else { log_info(LD_CONFIG, "Parsed %d previously stored client entries.", strmap_size(parsed_clients)); - tor_free(client_keys_str); } } @@ -870,8 +869,10 @@ rend_service_load_auth_keys(rend_service_t *s, const char *hfname) if (open_hfile) abort_writing_to_file(open_hfile); done: - tor_strclear(client_keys_str); - tor_free(client_keys_str); + if (client_keys_str) { + tor_strclear(client_keys_str); + tor_free(client_keys_str); + } strmap_free(parsed_clients, rend_authorized_client_strmap_item_free); memset(cfname, 0, sizeof(cfname)); |