diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2010-02-22 12:08:58 +0100 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2010-02-22 12:13:58 +0100 |
| commit | d41030436cc9b7473bb4f21bc492309553374b78 (patch) | |
| tree | 25b188f3eb7fedff18348e3a8918d6b88d8ce7fe /src | |
| parent | a7e0b2d6d9f7aaca005d267af6950abe4dd74d89 (diff) | |
| download | tor-d41030436cc9b7473bb4f21bc492309553374b78.tar tor-d41030436cc9b7473bb4f21bc492309553374b78.tar.gz | |
Expand homedirs in paths passed to tor-checkkey
This is so that coverity stops complaining about using a user-supplied
string with the open() syscall. Let's see if it works.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/tor-checkkey.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/tools/tor-checkkey.c b/src/tools/tor-checkkey.c index 739f7332d..30c223a7a 100644 --- a/src/tools/tor-checkkey.c +++ b/src/tools/tor-checkkey.c @@ -19,6 +19,7 @@ int main(int c, char **v) RSA *rsa; int wantdigest=0; int fname_idx; + char *fname=NULL; init_logging(); if (c < 2) { @@ -46,7 +47,13 @@ int main(int c, char **v) fname_idx = 1; } - str = read_file_to_str(v[fname_idx], 0, NULL); +#ifdef MS_WINDOWS + fname = tor_strdup(v[fname_idx]); +#else + fname = expand_filename(v[fname_idx]); +#endif + str = read_file_to_str(fname, 0, NULL); + tor_free(fname); if (!str) { fprintf(stderr, "Couldn't read %s\n", v[fname_idx]); return 1; |