summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/audio_out/audio_file_out.c2
-rw-r--r--src/audio_out/audio_oss_out.c8
-rw-r--r--src/audio_out/audio_sun_out.c8
-rw-r--r--src/dxr3/dxr3_decode_spu.c2
-rw-r--r--src/dxr3/dxr3_decode_video.c4
-rw-r--r--src/dxr3/dxr3_scr.c2
-rw-r--r--src/dxr3/video_out_dxr3.c8
-rw-r--r--src/input/input_cdda.c2
-rw-r--r--src/input/input_dvb.c12
-rw-r--r--src/input/input_file.c2
-rw-r--r--src/input/input_net.c7
-rw-r--r--src/input/input_pvr.c10
-rw-r--r--src/input/input_rtp.c4
-rw-r--r--src/input/input_stdin_fifo.c6
-rw-r--r--src/input/input_v4l.c10
-rw-r--r--src/input/input_vcd.c6
-rw-r--r--src/input/media_helper.c2
-rw-r--r--src/libw32dll/wine/registry.c4
-rw-r--r--src/video_out/video_out_fb.c6
-rw-r--r--src/video_out/video_out_pgx64.c2
-rw-r--r--src/video_out/video_out_vidix.c2
-rw-r--r--src/xine-engine/Makefile.am2
-rw-r--r--src/xine-engine/broadcaster.c4
-rw-r--r--src/xine-engine/io_helper.c4
-rw-r--r--src/xine-engine/xine_private.h7
-rw-r--r--src/xine-utils/utils.c61
-rw-r--r--src/xine-utils/xine_check.c10
27 files changed, 135 insertions, 62 deletions
diff --git a/src/audio_out/audio_file_out.c b/src/audio_out/audio_file_out.c
index 85ee8ad48..c8fe51f72 100644
--- a/src/audio_out/audio_file_out.c
+++ b/src/audio_out/audio_file_out.c
@@ -115,7 +115,7 @@ static int ao_file_open(ao_driver_t *this_gen, uint32_t bits, uint32_t rate, int
if (!this->fname)
this->fname = "xine-out.wav";
- this->fd = open(this->fname, O_WRONLY|O_TRUNC|O_CREAT, 0644);
+ this->fd = xine_create_cloexec(this->fname, O_WRONLY|O_TRUNC, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
if (this->fd == -1) {
xprintf (this->xine, XINE_VERBOSITY_LOG, "audio_file_out: Failed to open file '%s': %s\n",
diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c
index 693c2b80f..cf1608a25 100644
--- a/src/audio_out/audio_oss_out.c
+++ b/src/audio_out/audio_oss_out.c
@@ -190,7 +190,7 @@ static int ao_oss_open(ao_driver_t *this_gen,
* open audio device
*/
- this->audio_fd=open(this->audio_dev,O_WRONLY|O_NONBLOCK);
+ this->audio_fd = xine_open_cloexec(this->audio_dev, O_WRONLY|O_NONBLOCK);
if (this->audio_fd < 0) {
xprintf(this->xine, XINE_VERBOSITY_LOG,
_("audio_oss_out: Opening audio device %s: %s\n"), this->audio_dev, strerror(errno));
@@ -781,7 +781,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
xprintf(class->xine, XINE_VERBOSITY_LOG,
_("audio_oss_out: using device >%s<\n"), this->audio_dev);
- audio_fd = open(this->audio_dev, O_WRONLY|O_NONBLOCK);
+ audio_fd = xine_open_cloexec(this->audio_dev, O_WRONLY|O_NONBLOCK);
if (audio_fd < 0) {
xprintf(class->xine, XINE_VERBOSITY_LOG,
@@ -894,7 +894,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
_("audio_oss_out: Audio driver realtime sync disabled...\n"
"audio_oss_out: ...probing output buffer size: %d bytes\naudio_oss_out: ...there may be audio/video synchronization issues\n"), this->buffer_size);
- audio_fd=open(this->audio_dev, O_WRONLY|O_NONBLOCK);
+ audio_fd = xine_open_cloexec(this->audio_dev, O_WRONLY|O_NONBLOCK);
if(audio_fd < 0)
{
@@ -1048,7 +1048,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
}
_x_assert(this->mixer.name);
- this->mixer.fd = open(this->mixer.name, O_RDONLY);
+ this->mixer.fd = xine_open_cloexec(this->mixer.name, O_RDONLY);
if(this->mixer.fd != -1) {
diff --git a/src/audio_out/audio_sun_out.c b/src/audio_out/audio_sun_out.c
index 5b5f39365..34d2f14ec 100644
--- a/src/audio_out/audio_sun_out.c
+++ b/src/audio_out/audio_sun_out.c
@@ -160,7 +160,7 @@ static int realtime_samplecounter_available(xine_t *xine, char *dev)
if (silence == NULL)
goto error;
- if ((fd = open(dev, O_WRONLY|O_NONBLOCK)) < 0)
+ if ((fd = xine_open_cloexec(dev, O_WRONLY|O_NONBLOCK)) < 0)
goto error;
/* We wanted non blocking open but now put it back to normal */
@@ -449,7 +449,7 @@ static int ao_sun_open(ao_driver_t *this_gen,
* open audio device
*/
- this->audio_fd = open(this->audio_dev, O_WRONLY|O_NONBLOCK);
+ this->audio_fd = xine_open_cloexec(this->audio_dev, O_WRONLY|O_NONBLOCK);
if(this->audio_fd < 0) {
xprintf(this->xine, XINE_VERBOSITY_LOG,
_("audio_sun_out: opening audio device %s failed: %s\n"), this->audio_dev, strerror(errno));
@@ -939,8 +939,8 @@ static ao_driver_t *ao_sun_open_plugin (audio_driver_class_t *class_gen, const v
/*
* open the device
*/
-
- this->audio_fd = open(this->audio_dev = devname, O_WRONLY|O_NONBLOCK);
+ this->audio_dev = devname;
+ this->audio_fd = xine_open_cloexec(devname, O_WRONLY|O_NONBLOCK);
if(this->audio_fd < 0)
{
diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c
index ca2df4afd..0dc024253 100644
--- a/src/dxr3/dxr3_decode_spu.c
+++ b/src/dxr3/dxr3_decode_spu.c
@@ -236,7 +236,7 @@ static spu_decoder_t *dxr3_spudec_open_plugin(spu_decoder_class_t *class_gen, xi
else {
/* open dxr3 spu device */
snprintf(tmpstr, sizeof(tmpstr), "/dev/em8300_sp-%d", this->devnum);
- if ((this->fd_spu = open(tmpstr, O_WRONLY)) < 0) {
+ if ((this->fd_spu = xine_open_cloexec(tmpstr, O_WRONLY)) < 0) {
xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
_("dxr3_decode_spu: Failed to open spu device %s (%s)\n"), tmpstr, strerror(errno));
pthread_mutex_unlock(&this->dxr3_vo->spu_device_lock);
diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c
index 252415850..ec28b4648 100644
--- a/src/dxr3/dxr3_decode_video.c
+++ b/src/dxr3/dxr3_decode_video.c
@@ -227,7 +227,7 @@ static video_decoder_t *dxr3_open_plugin(video_decoder_class_t *class_gen, xine_
/* open later, because dxr3_video_out might have it open until we request a frame */
this->fd_video = -1;
- if ((this->fd_control = open(tmpstr, O_WRONLY)) < 0) {
+ if ((this->fd_control = xine_open_cloexec(tmpstr, O_WRONLY)) < 0) {
xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
_("dxr3_decode_video: Failed to open control device %s (%s)\n"), tmpstr, strerror(errno));
free(this);
@@ -508,7 +508,7 @@ static void dxr3_decode_data(video_decoder_t *this_gen, buf_element_t *buf)
/* open the device for the decoder */
snprintf (tmpstr, sizeof(tmpstr), "/dev/em8300_mv-%d", this->devnum);
- if ((this->fd_video = open(tmpstr, O_WRONLY)) < 0) {
+ if ((this->fd_video = xine_open_cloexec(tmpstr, O_WRONLY)) < 0) {
xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
_("dxr3_decode_video: Failed to open video device %s (%s)\n"), tmpstr, strerror(errno));
return;
diff --git a/src/dxr3/dxr3_scr.c b/src/dxr3/dxr3_scr.c
index dd0ea5840..b38a88444 100644
--- a/src/dxr3/dxr3_scr.c
+++ b/src/dxr3/dxr3_scr.c
@@ -75,7 +75,7 @@ dxr3_scr_t *dxr3_scr_init(xine_t *xine)
devnum = xine->config->register_num(xine->config,
CONF_KEY, 0, CONF_NAME, CONF_HELP, 10, NULL, NULL);
snprintf(tmpstr, sizeof(tmpstr), "/dev/em8300-%d", devnum);
- if ((this->fd_control = open(tmpstr, O_WRONLY)) < 0) {
+ if ((this->fd_control = xine_open_cloexec(tmpstr, O_WRONLY)) < 0) {
xprintf(this->xine, XINE_VERBOSITY_DEBUG,
"dxr3_scr: Failed to open control device %s (%s)\n", tmpstr, strerror(errno));
free(this);
diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c
index 233453738..a5d75cc69 100644
--- a/src/dxr3/video_out_dxr3.c
+++ b/src/dxr3/video_out_dxr3.c
@@ -271,7 +271,7 @@ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const v
snprintf(tmpstr, sizeof(tmpstr), "/dev/em8300-%d", class->devnum);
llprintf(LOG_VID, "Entering video init, devname = %s.\n", tmpstr);
- if ((this->fd_control = open(tmpstr, O_WRONLY)) < 0) {
+ if ((this->fd_control = xine_open_cloexec(tmpstr, O_WRONLY)) < 0) {
xprintf(this->class->xine, XINE_VERBOSITY_LOG,
_("video_out_dxr3: Failed to open control device %s (%s)\n"), tmpstr, strerror(errno));
@@ -280,7 +280,7 @@ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const v
}
snprintf (tmpstr, sizeof(tmpstr), "/dev/em8300_mv-%d", class->devnum);
- if ((this->fd_video = open (tmpstr, O_WRONLY | O_SYNC )) < 0) {
+ if ((this->fd_video = xine_open_cloexec(tmpstr, O_WRONLY | O_SYNC )) < 0) {
xprintf(this->class->xine, XINE_VERBOSITY_LOG,
_("video_out_dxr3: Failed to open video device %s (%s)\n"), tmpstr, strerror(errno));
return 0;
@@ -637,7 +637,7 @@ static void dxr3_update_frame_format(vo_driver_t *this_gen, vo_frame_t *frame_ge
/* open the device for the encoder */
snprintf(tmpstr, sizeof(tmpstr), "/dev/em8300_mv-%d", this->class->devnum);
- if ((this->fd_video = open(tmpstr, O_WRONLY)) < 0)
+ if ((this->fd_video = xine_open_cloexec(tmpstr, O_WRONLY)) < 0)
xprintf(this->class->xine, XINE_VERBOSITY_DEBUG,
"video_out_dxr3: Failed to open video device %s (%s)\n", tmpstr, strerror(errno));
@@ -832,7 +832,7 @@ static void dxr3_overlay_end(vo_driver_t *this_gen, vo_frame_t *frame_gen)
/* try to open the dxr3 spu device */
if (!this->fd_spu) {
snprintf (tmpstr, sizeof(tmpstr), "/dev/em8300_sp-%d", this->class->devnum);
- if ((this->fd_spu = open (tmpstr, O_WRONLY)) < 0) {
+ if ((this->fd_spu = xine_open_cloexec(tmpstr, O_WRONLY)) < 0) {
xprintf(this->class->xine, XINE_VERBOSITY_DEBUG,
"video_out_dxr3: Failed to open spu device %s (%s)\n"
"video_out_dxr3: Overlays are not available\n", tmpstr, strerror(errno));
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index 2cc2bd49d..20129706d 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -1938,7 +1938,7 @@ static int cdda_open(cdda_input_plugin_t *this_gen,
/* We use O_NONBLOCK for when /proc/sys/dev/cdrom/check_media is at 1 on
* Linux systems */
- fd = open (cdda_device, O_RDONLY | O_NONBLOCK);
+ fd = xine_open_cloexec(cdda_device, O_RDONLY | O_NONBLOCK);
if (fd == -1) {
return -1;
}
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index a045276d5..f56e806fd 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -617,7 +617,7 @@ static tuner_t *XINE_MALLOC tuner_init(xine_t * xine, int adapter)
}
}
for (x = 0; x < MAX_SUBTITLES; x++) {
- this->fd_subfilter[x] = open(this->demux_device, O_RDWR);
+ this->fd_subfilter[x] = xine_open_cloexec(this->demux_device, O_RDWR);
if (this->fd_subfilter[x] < 0) {
xprintf(this->xine, XINE_VERBOSITY_DEBUG, "DEMUX DEVICE Subtitle filter: %s\n", strerror(errno));
}
@@ -638,7 +638,7 @@ static tuner_t *XINE_MALLOC tuner_init(xine_t * xine, int adapter)
if(this->feinfo.type==FE_OFDM) xprintf(this->xine,XINE_VERBOSITY_DEBUG,"TER Card\n");
if(this->feinfo.type==FE_ATSC) xprintf(this->xine,XINE_VERBOSITY_DEBUG,"US Card\n");
- if ((test_video=open(video_device, O_RDWR)) < 0) {
+ if ((test_video=xine_open_cloexec(video_device, O_RDWR)) < 0) {
xprintf(this->xine,XINE_VERBOSITY_DEBUG,"input_dvb: Card has no hardware decoder\n");
}else{
xprintf(this->xine,XINE_VERBOSITY_DEBUG,"input_dvb: Card HAS HARDWARE DECODER\n");
@@ -2126,7 +2126,7 @@ static int switch_channel(dvb_input_plugin_t *this, int channel) {
for (x = 0; x < MAX_FILTERS; x++) {
close(this->tuner->fd_pidfilter[x]);
- this->tuner->fd_pidfilter[x] = open(this->tuner->demux_device, O_RDWR);
+ this->tuner->fd_pidfilter[x] = xine_open_cloexec(this->tuner->demux_device, O_RDWR);
}
if (!tuner_set_channel (this, &this->channels[channel])) {
@@ -2160,7 +2160,7 @@ static int switch_channel(dvb_input_plugin_t *this, int channel) {
this->channel = channel;
- this->fd = open (this->tuner->dvr_device, O_RDONLY | O_NONBLOCK);
+ this->fd = xine_open_cloexec(this->tuner->dvr_device, O_RDONLY | O_NONBLOCK);
this->tuned_in = 1;
pthread_mutex_unlock (&this->channel_change_mutex);
@@ -2234,7 +2234,7 @@ static void do_record (dvb_input_plugin_t *this) {
}
/* start recording */
- this->record_fd = open (filename, O_CREAT | O_APPEND | O_WRONLY, 0644);
+ this->record_fd = xine_create_cloexec(filename, O_APPEND | O_WRONLY, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
this->stream->osd_renderer->clear (this->rec_osd);
@@ -2980,7 +2980,7 @@ static int dvb_plugin_open(input_plugin_t * this_gen)
return 0;
}
- if ((this->fd = open(this->tuner->dvr_device, O_RDONLY |O_NONBLOCK)) < 0) {
+ if ((this->fd = xine_open_cloexec(this->tuner->dvr_device, O_RDONLY |O_NONBLOCK)) < 0) {
xprintf(this->class->xine, XINE_VERBOSITY_LOG,
_("input_dvb: cannot open dvr device '%s'\n"), this->tuner->dvr_device);
return 0;
diff --git a/src/input/input_file.c b/src/input/input_file.c
index ee8957894..4c5e3e563 100644
--- a/src/input/input_file.c
+++ b/src/input/input_file.c
@@ -359,7 +359,7 @@ static int file_plugin_open (input_plugin_t *this_gen ) {
else
filename = strdup(this->mrl); /* NEVER unescape plain file names! */
- this->fh = open (filename, O_RDONLY|O_BINARY);
+ this->fh = xine_open_cloexec(filename, O_RDONLY|O_BINARY);
if (this->fh == -1) {
if (errno == EACCES) {
diff --git a/src/input/input_net.c b/src/input/input_net.c
index 5007b58a3..cd4a8c901 100644
--- a/src/input/input_net.c
+++ b/src/input/input_net.c
@@ -115,7 +115,7 @@ static int host_connect_attempt_ipv4(struct in_addr ia, int port, xine_t *xine)
int s;
struct sockaddr_in sin;
- s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+ s = xine_socket_cloexec(PF_INET, SOCK_STREAM, IPPROTO_TCP);
if (s==-1) {
xine_log(xine, XINE_LOG_MSG,
_("input_net: socket(): %s\n"), strerror(errno));
@@ -143,10 +143,9 @@ static int host_connect_attempt_ipv4(struct in_addr ia, int port, xine_t *xine)
#else
static int host_connect_attempt(int family, struct sockaddr* sin, int addrlen, xine_t *xine) {
- int s;
+ int s = xine_socket_cloexec(family, SOCK_STREAM, IPPROTO_TCP);
- s = socket(family, SOCK_STREAM, IPPROTO_TCP);
- if (s==-1) {
+ if (s == -1) {
xine_log(xine, XINE_LOG_MSG,
_("input_net: socket(): %s\n"), strerror(errno));
return -1;
diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c
index 288434c47..53c104299 100644
--- a/src/input/input_pvr.c
+++ b/src/input/input_pvr.c
@@ -584,7 +584,7 @@ static int pvr_break_rec_page (pvr_input_plugin_t *this) {
lprintf("opening pvr file for writing (%s)\n", filename);
- this->rec_fd = open(filename, O_RDWR | O_CREAT | O_TRUNC, 0666 );
+ this->rec_fd = xine_create_cloexec(filename, O_RDWR | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
if( this->rec_fd == -1 ) {
xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
_("input_pvr: error creating pvr file (%s)\n"), filename);
@@ -741,7 +741,7 @@ static int pvr_play_file(pvr_input_plugin_t *this, fifo_buffer_t *fifo, uint8_t
lprintf("opening pvr file for reading (%s)\n", filename);
- this->play_fd = open(filename, O_RDONLY );
+ this->play_fd = xine_open_cloexec(filename, O_RDONLY);
if( this->play_fd == -1 ) {
xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
_("input_pvr: error opening pvr file (%s)\n"), filename);
@@ -1009,7 +1009,7 @@ static void pvr_event_handler (pvr_input_plugin_t *this) {
/* as of ivtv 0.10.6: must close and reopen to set input */
close(this->dev_fd);
- this->dev_fd = open (this->class->devname, O_RDWR);
+ this->dev_fd = xine_open_cloexec(this->class->devname, O_RDWR);
if (this->dev_fd < 0) {
xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
"input_pvr: error opening device %s\n", this->class->devname );
@@ -1156,7 +1156,7 @@ static void pvr_event_handler (pvr_input_plugin_t *this) {
/* how lame. we must close and reopen to change bitrate. */
close(this->dev_fd);
- this->dev_fd = open (this->class->devname, O_RDWR);
+ this->dev_fd = xine_open_cloexec(this->class->devname, O_RDWR);
if (this->dev_fd == -1) {
xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
_("input_pvr: error opening device %s\n"), this->class->devname );
@@ -1416,7 +1416,7 @@ static int pvr_plugin_open (input_plugin_t *this_gen ) {
this->saved_id = 0;
- this->dev_fd = open (this->class->devname, O_RDWR);
+ this->dev_fd = xine_open_cloexec(this->class->devname, O_RDWR);
if (this->dev_fd == -1) {
xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
_("input_pvr: error opening device %s\n"), this->class->devname );
diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c
index 175c61b41..c62c4ce9b 100644
--- a/src/input/input_rtp.c
+++ b/src/input/input_rtp.c
@@ -171,7 +171,7 @@ typedef struct {
static int host_connect_attempt(struct in_addr ia, int port,
const char *interface,
xine_t *xine) {
- int s=socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
+ int s = xine_socket_cloexec(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
union {
struct sockaddr_in in;
struct sockaddr sa;
@@ -180,7 +180,7 @@ static int host_connect_attempt(struct in_addr ia, int port,
int multicast = 0; /* boolean, assume unicast */
if(s == -1) {
- LOG_MSG(xine, _("socket(): %s.\n"), strerror(errno));
+ LOG_MSG(xine, _("xine_socket_cloexec(): %s.\n"), strerror(errno));
return -1;
}
diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c
index 9d6f7059f..e0aecdc39 100644
--- a/src/input/input_stdin_fifo.c
+++ b/src/input/input_stdin_fifo.c
@@ -251,10 +251,10 @@ static int stdin_plugin_open (input_plugin_t *this_gen ) {
lprintf ("trying to open '%s'...\n", this->mrl);
if (this->fh == -1) {
- char *filename;
+ const char *filename;
- filename = (char *) &this->mrl[5];
- this->fh = open (filename, FILE_FLAGS);
+ filename = (const char *) &this->mrl[5];
+ this->fh = xine_open_cloexec(filename, FILE_FLAGS);
lprintf("filename '%s'\n", filename);
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index 5d38cb4e4..c91b273e7 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -822,7 +822,7 @@ static int open_radio_capture_device(v4l_input_plugin_t *this)
entry = this->stream->xine->config->lookup_entry(this->stream->xine->config,
"media.video4linux.radio_device");
- if((this->radio_fd = open(entry->str_value, O_RDWR)) < 0) {
+ if((this->radio_fd = xine_open_cloexec(entry->str_value, O_RDWR)) < 0) {
xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
"input_v4l: error opening v4l device (%s): %s\n",
entry->str_value, strerror(errno));
@@ -875,7 +875,7 @@ static int open_video_capture_device(v4l_input_plugin_t *this)
"media.video4linux.video_device");
/* Try to open the video device */
- if((this->video_fd = open(entry->str_value, O_RDWR)) < 0) {
+ if((this->video_fd = xine_open_cloexec(entry->str_value, O_RDWR)) < 0) {
xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
"input_v4l: error opening v4l device (%s): %s\n",
entry->str_value, strerror(errno));
@@ -1568,7 +1568,7 @@ static void v4l_plugin_dispose (input_plugin_t *this_gen) {
if (this->tuner_name)
free(this->tuner_name);
- /* Close video device only if device was openend */
+ /* Close video device only if device was opened */
if (this->video_fd > 0) {
/* Restore v4l audio volume */
@@ -1799,7 +1799,7 @@ static input_plugin_t *v4l_class_get_video_instance (input_class_t *cls_gen,
"media.video4linux.video_device");
/* Try to open the video device */
- if((this->video_fd = open(entry->str_value, O_RDWR)) < 0) {
+ if((this->video_fd = xine_open_cloexec(entry->str_value, O_RDWR)) < 0) {
xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
"input_v4l: error opening v4l device (%s): %s\n",
entry->str_value, strerror(errno));
@@ -1862,7 +1862,7 @@ static input_plugin_t *v4l_class_get_radio_instance (input_class_t *cls_gen,
entry = this->stream->xine->config->lookup_entry(this->stream->xine->config,
"media.video4linux.radio_device");
- if((this->radio_fd = open(entry->str_value, O_RDWR)) < 0) {
+ if((this->radio_fd = xine_open_cloexec(entry->str_value, O_RDWR)) < 0) {
xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
"input_v4l: error opening v4l device (%s): %s\n",
entry->str_value, strerror(errno));
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index 4f9c75cd2..14b86a4c0 100644
--- a/src/input/input_vcd.c
+++ b/src/input/input_vcd.c
@@ -832,7 +832,7 @@ static int vcd_plugin_open (input_plugin_t *this_gen) {
char *filename;
int fd;
- fd = open (cls->device, O_RDONLY|O_EXCL);
+ fd = xine_open_cloexec(cls->device, O_RDONLY|O_EXCL);
if (fd == -1) {
return 0;
}
@@ -966,7 +966,7 @@ static xine_mrl_t **vcd_class_get_dir (input_class_t *this_gen, const char *file
return NULL;
- fd = open (this->device, O_RDONLY|O_EXCL);
+ fd = xine_open_cloexec(this->device, O_RDONLY|O_EXCL);
if (fd == -1) {
xprintf (this->xine, XINE_VERBOSITY_LOG,
@@ -1028,7 +1028,7 @@ static char ** vcd_class_get_autoplay_list (input_class_t *this_gen, int *num_fi
int i, fd;
- fd = open (this->device, O_RDONLY|O_EXCL);
+ fd = xine_open_cloexec(this->device, O_RDONLY|O_EXCL);
if (fd == -1) {
xprintf (this->xine, XINE_VERBOSITY_LOG,
diff --git a/src/input/media_helper.c b/src/input/media_helper.c
index e19ca63e6..1a82a406c 100644
--- a/src/input/media_helper.c
+++ b/src/input/media_helper.c
@@ -99,7 +99,7 @@ int media_eject_media (xine_t *xine, const char *device)
media_umount_media(device);
/* printf("input_dvd: umount result: %s\n", strerror(errno)); */
- if ((fd = open (device, O_RDONLY|O_NONBLOCK)) > -1) {
+ if ((fd = xine_open_cloexec(device, O_RDONLY|O_NONBLOCK)) > -1) {
#if defined (__linux__)
int ret, status;
diff --git a/src/libw32dll/wine/registry.c b/src/libw32dll/wine/registry.c
index b12974416..5f9a3fdc4 100644
--- a/src/libw32dll/wine/registry.c
+++ b/src/libw32dll/wine/registry.c
@@ -90,7 +90,7 @@ static void open_registry(void)
printf("Multiple open_registry(>\n");
return;
}
- fd = open(localregpathname, O_RDONLY);
+ fd = xine_open_cloexec(localregpathname, O_RDONLY);
if (fd == -1)
{
printf("Creating new registry\n");
@@ -133,7 +133,7 @@ static void save_registry(void)
int fd, i;
if (!regs)
init_registry();
- fd = open(localregpathname, O_WRONLY | O_CREAT, 00666);
+ fd = xine_create_cloexec(localregpathname, O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
if (fd == -1)
{
printf("Failed to open registry file '%s' for writing.\n",
diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c
index e6e30af7e..cfc5cf3a6 100644
--- a/src/video_out/video_out_fb.c
+++ b/src/video_out/video_out_fb.c
@@ -808,17 +808,17 @@ static int open_fb_device(config_values_t *config, xine_t *xine)
XINE_CONFIG_SECURITY, NULL, NULL);
if(strlen(device_name) > 3)
{
- fd = open(device_name, O_RDWR);
+ fd = xine_open_cloexec(device_name, O_RDWR);
}
else
{
device_name = "/dev/fb1";
- fd = open(device_name, O_RDWR);
+ fd = xine_open_cloexec(device_name, O_RDWR);
if(fd < 0)
{
device_name = "/dev/fb0";
- fd = open(device_name, O_RDWR);
+ fd = xine_open_cloexec(device_name, O_RDWR);
}
}
diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c
index d30985e39..7c82f6145 100644
--- a/src/video_out/video_out_pgx64.c
+++ b/src/video_out/video_out_pgx64.c
@@ -292,7 +292,7 @@ static int setup_dga(pgx64_driver_t *this)
devname = dga_draw_devname(this->dgadraw);
DGA_DRAW_UNLOCK(this->dgadraw);
- if ((this->devfd = open(devname, O_RDWR)) < 0) {
+ if ((this->devfd = xine_open_cloexec(devname, O_RDWR)) < 0) {
xprintf(this->class->xine, XINE_VERBOSITY_LOG, _("video_out_pgx64: Error: can't open framebuffer device '%s'\n"), devname);
XDgaUnGrabDrawable(this->dgadraw);
XUnlockDisplay(this->display);
diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c
index fa476c492..41406fb58 100644
--- a/src/video_out/video_out_vidix.c
+++ b/src/video_out/video_out_vidix.c
@@ -1245,7 +1245,7 @@ static vo_driver_t *vidixfb_open_plugin (video_driver_class_t *class_gen, const
XINE_CONFIG_SECURITY, NULL, NULL);
/* Open fb device for reading */
- if((fd = open("/dev/fb0", O_RDONLY)) < 0) {
+ if((fd = xine_open_cloexec("/dev/fb0", O_RDONLY)) < 0) {
xprintf(this->xine, XINE_VERBOSITY_DEBUG,
"video_out_vidix: unable to open frame buffer device \"%s\": %s\n", device, strerror(errno));
return NULL;
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index a0131a5e5..df35a7da4 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -20,7 +20,7 @@ else
DEF_FILE =
endif
-noinst_HEADERS = bswap.h ffmpeg_bswap.h
+noinst_HEADERS = bswap.h ffmpeg_bswap.h xine_private.h
lib_LTLIBRARIES = libxine.la
diff --git a/src/xine-engine/broadcaster.c b/src/xine-engine/broadcaster.c
index f5ac0156f..00b38beb3 100644
--- a/src/xine-engine/broadcaster.c
+++ b/src/xine-engine/broadcaster.c
@@ -228,6 +228,8 @@ static void *manager_loop (void *this_gen) {
ssock = accept(this->msock, &(fsin.sa), &alen);
if (ssock >= 0) {
+ _x_set_socket_close_on_exec(ssock);
+
/* identification string, helps demuxer probing */
if( sock_string_write(this->stream->xine, ssock,"master xine v1") > 0 ) {
int *psock = malloc(sizeof(int));
@@ -308,7 +310,7 @@ broadcaster_t *_x_init_broadcaster(xine_stream_t *stream, int port)
} servAddr;
int msock, err;
- msock = socket(PF_INET, SOCK_STREAM, 0);
+ msock = xine_socket_cloexec(PF_INET, SOCK_STREAM, 0);
if( msock < 0 )
{
xprintf(stream->xine, XINE_VERBOSITY_DEBUG, "broadcaster: error opening master socket.\n");
diff --git a/src/xine-engine/io_helper.c b/src/xine-engine/io_helper.c
index d331b675a..399cb25a4 100644
--- a/src/xine-engine/io_helper.c
+++ b/src/xine-engine/io_helper.c
@@ -60,7 +60,7 @@ static int _x_io_tcp_connect_ipv4(xine_stream_t *stream, const char *host, int p
return -1;
}
- s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+ s = xine_socket_cloexec(PF_INET, SOCK_STREAM, IPPROTO_TCP);
if (s == -1) {
_x_message(stream, XINE_MSG_CONNECTION_REFUSED, "failed to create socket", strerror(errno), NULL);
return -1;
@@ -144,7 +144,7 @@ int _x_io_tcp_connect(xine_stream_t *stream, const char *host, int port) {
while (tmpaddr) {
- s = socket(tmpaddr->ai_family, SOCK_STREAM, IPPROTO_TCP);
+ s = xine_socket_cloexec(tmpaddr->ai_family, SOCK_STREAM, IPPROTO_TCP);
if (s == -1) {
_x_message(stream, XINE_MSG_CONNECTION_REFUSED,
"failed to create socket", strerror(errno), NULL);
diff --git a/src/xine-engine/xine_private.h b/src/xine-engine/xine_private.h
index 6c01d3a2d..a4c2a1d4f 100644
--- a/src/xine-engine/xine_private.h
+++ b/src/xine-engine/xine_private.h
@@ -94,4 +94,11 @@ void _x_audio_decoder_shutdown (xine_stream_t *stream) INTERNAL;
*/
void xine_probe_fast_memcpy(xine_t *xine) INTERNAL;
+/**
+ * @brief make file descriptors and sockets uninheritable
+ */
+int _x_set_file_close_on_exec(int fd) XINE_INTERNAL;
+
+int _x_set_socket_close_on_exec(int s) XINE_INTERNAL;
+
#endif
diff --git a/src/xine-utils/utils.c b/src/xine-utils/utils.c
index 75caaf09f..27c52c70d 100644
--- a/src/xine-utils/utils.c
+++ b/src/xine-utils/utils.c
@@ -35,9 +35,12 @@
#include <errno.h>
#include <pwd.h>
+#include <sys/types.h>
#include <sys/time.h>
+#include <sys/socket.h>
#include <time.h>
#include <unistd.h>
+#include <fcntl.h>
#if HAVE_EXECINFO_H
#include <execinfo.h>
@@ -56,6 +59,10 @@
#include <windows.h>
#endif
+#ifndef O_CLOEXEC
+# define O_CLOEXEC 0
+#endif
+
typedef struct {
const char language[16]; /* name of the locale */
const char encoding[16]; /* typical encoding */
@@ -717,3 +724,57 @@ char *xine_strcat_realloc (char **dest, char *append)
strcat (*dest = newstr, append);
return newstr;
}
+
+
+int _x_set_file_close_on_exec(int fd)
+{
+#ifndef WIN32
+ return fcntl(fd, F_SETFD, FD_CLOEXEC);
+#else
+ return SetHandleInformation((HANDLE)_get_osfhandle(fd), HANDLE_FLAG_INHERIT, 0);
+#endif
+}
+
+int _x_set_socket_close_on_exec(int s)
+{
+#ifndef WIN32
+ return fcntl(s, F_SETFD, FD_CLOEXEC);
+#else
+ return SetHandleInformation((HANDLE)s, HANDLE_FLAG_INHERIT, 0);
+#endif
+}
+
+
+int xine_open_cloexec(const char *name, int flags)
+{
+ int fd = open(name, (flags | O_CLOEXEC));
+
+ if (fd >= 0) {
+ _x_set_file_close_on_exec(fd);
+ }
+
+ return fd;
+}
+
+int xine_create_cloexec(const char *name, int flags, mode_t mode)
+{
+ int fd = open(name, (flags | O_CREAT | O_CLOEXEC), mode);
+
+ if (fd >= 0) {
+ _x_set_file_close_on_exec(fd);
+ }
+
+ return fd;
+}
+
+int xine_socket_cloexec(int domain, int type, int protocol)
+{
+ int s = socket(domain, type, protocol);
+
+ if (s >= 0) {
+ _x_set_socket_close_on_exec(s);
+ }
+
+ return s;
+}
+
diff --git a/src/xine-utils/xine_check.c b/src/xine-utils/xine_check.c
index b0a252b6f..3c860493b 100644
--- a/src/xine-utils/xine_check.c
+++ b/src/xine-utils/xine_check.c
@@ -46,6 +46,10 @@
#include <xine/xineutils.h>
+#ifndef O_CLOEXEC
+# define O_CLOEXEC 0
+#endif
+
#if defined(__linux__)
#include <dlfcn.h>
@@ -168,7 +172,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 +208,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 +251,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;
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 11:35:35 +0000