diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-11-20 01:16:29 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-11-20 01:16:29 -0500 |
| commit | e669d25e43d4c21f11a396c07dc8ed632b406139 (patch) | |
| tree | 402e8dcab343ddba8f8c66daa7d197616f402750 /src/or | |
| parent | 5a66de7015d32e723f13171b622a8dabcef05126 (diff) | |
| download | tor-e669d25e43d4c21f11a396c07dc8ed632b406139.tar tor-e669d25e43d4c21f11a396c07dc8ed632b406139.tar.gz | |
Do cloexec on socketpairs and stdio files
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/dirserv.c | 2 | ||||
| -rw-r--r-- | src/or/geoip.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 4f793dc74..4410d558e 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2445,7 +2445,7 @@ dirserv_read_measured_bandwidths(const char *from_file, smartlist_t *routerstatuses) { char line[256]; - FILE *fp = fopen(from_file, "r"); + FILE *fp = tor_fopen_cloexec(from_file, "r"); int applied_lines = 0; time_t file_time; int ok; diff --git a/src/or/geoip.c b/src/or/geoip.c index ae0776a57..84681821b 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -206,7 +206,7 @@ geoip_load_file(const char *filename, or_options_t *options) int severity = options_need_geoip_info(options, &msg) ? LOG_WARN : LOG_INFO; crypto_digest_env_t *geoip_digest_env = NULL; clear_geoip_db(); - if (!(f = fopen(filename, "r"))) { + if (!(f = tor_fopen_cloexec(filename, "r"))) { log_fn(severity, LD_GENERAL, "Failed to open GEOIP file %s. %s", filename, msg); return -1; |