3 files changed, 54 insertions, 3 deletions

diff --git a/src/xine-utils/utils.c b/src/xine-utils/utils.c
index 2f62c95a8..f5d5a0ff3 100644
--- a/src/xine-utils/utils.c
+++ b/src/xine-utils/utils.c
@@ -38,6 +38,7 @@
 #include <sys/time.h>
 #include <time.h>
 #include <unistd.h>
+#include <fcntl.h>
 
 #if HAVE_EXECINFO_H
 #include <execinfo.h>
@@ -56,6 +57,10 @@
 #include <windows.h>
 #endif
 
+#ifndef O_CLOEXEC
+#  define O_CLOEXEC  0
+#endif
+
 typedef struct {
   char                    *language;     /* name of the locale */
   char                    *encoding;     /* typical encoding */
@@ -697,3 +702,37 @@ char *xine_strcat_realloc (char **dest, char *append)
     strcat (*dest = newstr, append);
   return newstr;
 }
+
+
+static int set_close_on_execute(int fd)
+{
+#ifndef WIN32
+  return fcntl(fd, F_SETFD, FD_CLOEXEC);
+#else
+  return SetHandleInformation((HANDLE)_get_osfhandle(fd), HANDLE_FLAG_INHERIT, 0);
+#endif
+}
+
+
+int open_cloexec(const char *name, int flags)
+{
+  int fd = open(name, (flags | O_CLOEXEC));
+
+  if (fd >= 0) {
+    set_close_on_execute(fd);
+  }
+
+  return fd;
+}
+
+int create_cloexec(const char *name, int flags, mode_t mode)
+{
+  int fd = open(name, (flags | O_CREAT | O_CLOEXEC), mode);
+
+  if (fd >= 0) {
+    set_close_on_execute(fd);
+  }
+
+  return fd;
+}
+
diff --git a/src/xine-utils/xine_check.c b/src/xine-utils/xine_check.c
index ad94b0382..90100d725 100644
--- a/src/xine-utils/xine_check.c
+++ b/src/xine-utils/xine_check.c
@@ -168,7 +168,7 @@ static xine_health_check_t* _x_health_check_cdrom (xine_health_check_t* hc) {
     return hc;
   }
 
-  if ( (fd = open(hc->cdrom_dev, O_RDWR)) < 0) {
+  if ( (fd = open(hc->cdrom_dev, O_RDWR | O_CLOEXEC)) < 0) {
     switch (errno) {
     case EACCES:
       set_hc_result (hc, XINE_HEALTH_CHECK_FAIL, "FAILED - %s permissions are not sufficient\n.", hc->cdrom_dev);
@@ -204,7 +204,7 @@ static xine_health_check_t* _x_health_check_dvdrom(xine_health_check_t* hc) {
     return hc;
   }
 
-  if ( (fd = open(hc->dvd_dev, O_RDWR)) < 0) {
+  if ( (fd = open(hc->dvd_dev, O_RDWR | O_CLOEXEC)) < 0) {
     switch (errno) {
     case EACCES:
       set_hc_result (hc, XINE_HEALTH_CHECK_FAIL, "FAILED - %s permissions are not sufficient\n.", hc->dvd_dev);
@@ -247,7 +247,7 @@ static xine_health_check_t* _x_health_check_dma (xine_health_check_t* hc) {
     return hc;
   }
 
-  fd = open (hc->dvd_dev, O_RDONLY | O_NONBLOCK);
+  fd = open (hc->dvd_dev, O_RDONLY | O_NONBLOCK | O_CLOEXEC);
   if (fd < 0) {
     set_hc_result(hc, XINE_HEALTH_CHECK_FAIL, "FAILED - Could not open %s.\n", hc->dvd_dev);
     return hc;
diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h
index 0fd0bbf0e..5fe1fb7e5 100644
--- a/src/xine-utils/xineutils.h
+++ b/src/xine-utils/xineutils.h
@@ -215,6 +215,18 @@ void xine_strdupa(char *dest, char *src) XINE_PROTECTED XINE_DEPRECATED;
  */
 char *xine_strcat_realloc (char **dest, char *append) XINE_PROTECTED;
 
+/**
+ * opens a file, ensuring that the descriptor will be closed
+ * automatically after a fork/execute.
+ */
+int open_cloexec(const char *name, int flags) XINE_PROTECTED;
+
+/**
+ * creates a file, ensuring that the descriptor will be closed
+ * automatically after a fork/execute.
+ */
+int create_cloexec(const char *name, int flags, mode_t mode) XINE_PROTECTED;
+
 /*
  * Color Conversion Utility Functions
  * The following data structures and functions facilitate the conversion