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

Stop crashing when a NULL filename is passed to file_status()

Browse Source 
Stop crashing when a NULL filename is passed to file_status(),
instead, return FN_ERROR.
Also return FN_ERROR when a zero-length filename is passed to file_status().
Fixed as part of bug 13111.
This commit is contained in:
teor 2014-11-08 20:03:21 +11:00
parent bac6d542c9
commit ce7fd6e160
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
changes/bug13111-generate-keys-on-empty-file Normal file
View File

@ -0,0 +1,7 @@
o Minor bugfixes
- Stop crashing when a NULL filename is passed to file_status().
Fixed as part of bug 13111.
o Minor enhancements:
- Return FN_ERROR when a zero-length filename is passed to file_status().
Fixed as part of bug 13111.

6
src/common/util.c
View File

@ -1888,7 +1888,8 @@ clean_name_for_stat(char *name)
#endif
}
/** Return FN_ERROR if filename can't be read, FN_NOENT if it doesn't
/** Return FN_ERROR if filename can't be read, or is NULL or zero-length,
* FN_NOENT if it doesn't
* exist, FN_FILE if it is a regular file, or FN_DIR if it's a
* directory. On FN_ERROR, sets errno. */
file_status_t
@ -1897,6 +1898,9 @@ file_status(const char *fname)
struct stat st;
char *f;
int r;
if (!fname || strlen(fname) == 0) {
return FN_ERROR;
}
f = tor_strdup(fname);
clean_name_for_stat(f);
log_debug(LD_FS, "stat()ing %s", f);