diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-02-18 12:55:57 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-02-18 12:55:57 -0500 |
| commit | eb07166eb8aed3a37fe0e5ade476d7084bc0c5e4 (patch) | |
| tree | 938cfc3f32af76c0e88553826568ce0d91ea3829 /src | |
| parent | 17724a7cdeb9b98539831f1164a82784f1fb050f (diff) | |
| download | tor-eb07166eb8aed3a37fe0e5ade476d7084bc0c5e4.tar.gz tor-eb07166eb8aed3a37fe0e5ade476d7084bc0c5e4.zip | |
Make sure callers can handle NULL ext-or auth cookie filename
Diffstat (limited to 'src')
| -rw-r--r-- | src/app/main/shutdown.c | 3 | ||||
| -rw-r--r-- | src/feature/client/transports.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/app/main/shutdown.c b/src/app/main/shutdown.c index 27d92609eb..aac15246b9 100644 --- a/src/app/main/shutdown.c +++ b/src/app/main/shutdown.c @@ -75,7 +75,8 @@ tor_cleanup(void) /* Remove Extended ORPort cookie authentication file */ { char *cookie_fname = get_ext_or_auth_cookie_file_name(); - tor_remove_file(cookie_fname); + if (cookie_fname) + tor_remove_file(cookie_fname); tor_free(cookie_fname); } if (accounting_is_enabled(options)) diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c index a8ea9781a4..55069bb60a 100644 --- a/src/feature/client/transports.c +++ b/src/feature/client/transports.c @@ -1420,8 +1420,10 @@ create_managed_proxy_environment(const managed_proxy_t *mp) smartlist_add_asprintf(envs, "TOR_PT_EXTENDED_SERVER_PORT=%s", ext_or_addrport_tmp); } - smartlist_add_asprintf(envs, "TOR_PT_AUTH_COOKIE_FILE=%s", - cookie_file_loc); + if (cookie_file_loc) { + smartlist_add_asprintf(envs, "TOR_PT_AUTH_COOKIE_FILE=%s", + cookie_file_loc); + } tor_free(ext_or_addrport_tmp); tor_free(cookie_file_loc); |