diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-09-13 12:31:41 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-09-13 12:31:41 -0400 |
| commit | e0b2cd061bd62fc790d434b2da7ecc51ed100904 (patch) | |
| tree | 0bdd72522895a018e4fc9765df0f3067eff940a1 /src/common/compat.c | |
| parent | dffc5c3f240e7734e85a427b951c4e493c85906c (diff) | |
| parent | 7cf1b9cc33ab2ba13d84e08105699dd1f39dae1d (diff) | |
| download | tor-e0b2cd061bd62fc790d434b2da7ecc51ed100904.tar.gz tor-e0b2cd061bd62fc790d434b2da7ecc51ed100904.zip | |
Merge remote-tracking branch 'ctoader/gsoc-cap-stage2'
Conflicts:
src/common/sandbox.c
Diffstat (limited to 'src/common/compat.c')
| -rw-r--r-- | src/common/compat.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/compat.c b/src/common/compat.c index d6ea41878a..8e2619f846 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -110,6 +110,7 @@ #include "util.h" #include "container.h" #include "address.h" +#include "sandbox.h" /* Inline the strl functions if the platform doesn't have them. */ #ifndef HAVE_STRLCPY @@ -126,6 +127,7 @@ tor_open_cloexec(const char *path, int flags, unsigned mode) { int fd; #ifdef O_CLOEXEC + path = sandbox_intern_string(path); fd = open(path, flags|O_CLOEXEC, mode); if (fd >= 0) return fd; |