godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32617 from Faless/fix/fopen_close_exec 

Disable file descriptor sharing with subprocs.
This commit is contained in:
Rémi Verschelde 2019-10-26 23:11:41 +02:00 committed by GitHub
parent 3eb8bd08ec ad9a5ee6f1
commit ad685960da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/unix/file_access_unix.cpp
View File

@ -56,6 +56,12 @@
#define S_ISREG(m) ((m)&S_IFREG) #define S_ISREG(m) ((m)&S_IFREG)
#endif #endif
#ifndef NO_FCNTL
#include <fcntl.h>
#else
#include <sys/ioctl.h>
#endif
void FileAccessUnix::check_errors() const { void FileAccessUnix::check_errors() const {
ERR_FAIL_COND_MSG(!f, "File must be opened before use."); ERR_FAIL_COND_MSG(!f, "File must be opened before use.");
@ -123,11 +129,24 @@ Error FileAccessUnix::_open(const String &p_path, int p_mode_flags) {
} break; } break;
} }
return last_error; return last_error;
} else {
last_error = OK;
flags = p_mode_flags;
return OK;
} }
// Set close on exec to avoid leaking it to subprocesses.
int fd = fileno(f);
if (fd != -1) {
#if defined(NO_FCNTL)
unsigned long par = 0;
ioctl(fd, FIOCLEX, &par);
#else
int opts = fcntl(fd, F_GETFD);
fcntl(fd, F_SETFD, opts | FD_CLOEXEC);
#endif
}
last_error = OK;
flags = p_mode_flags;
return OK;
} }
void FileAccessUnix::close() { void FileAccessUnix::close() {