zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-11-10 15:01:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Time-of-check time-of-use race condition in OSS driver

Browse source
This commit is contained in:
derselbst 2022-01-28 15:42:02 +01:00
parent 59fdc3795b
commit d6903d0ff7
1 changed files with 24 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/drivers/fluid_oss.c
View file

@ -198,9 +198,18 @@ new_fluid_oss_audio_driver(fluid_settings_t *settings, fluid_synth_t *synth)
} }
} }
if(stat(devname, &devstat) == -1) dev->dspfd = open(devname, O_WRONLY, 0);
if(dev->dspfd == -1)
{ {
FLUID_LOG(FLUID_ERR, "Device <%s> does not exists", devname); FLUID_LOG(FLUID_ERR, "Device <%s> could not be opened for writing: %s",
devname, g_strerror(errno));
goto error_recovery;
}
if(fstat(dev->dspfd, &devstat) == -1)
{
FLUID_LOG(FLUID_ERR, "fstat failed on device <%s>: %s", devname, g_strerror(errno));
goto error_recovery; goto error_recovery;
} }
@ -210,15 +219,6 @@ new_fluid_oss_audio_driver(fluid_settings_t *settings, fluid_synth_t *synth)
goto error_recovery; goto error_recovery;
} }
dev->dspfd = open(devname, O_WRONLY, 0);
if(dev->dspfd == -1)
{
FLUID_LOG(FLUID_ERR, "Device <%s> could not be opened for writing: %s",
devname, strerror(errno));
goto error_recovery;
}
if(fluid_oss_set_queue_size(dev, sample_size, 2, queuesize, period_size) < 0) if(fluid_oss_set_queue_size(dev, sample_size, 2, queuesize, period_size) < 0)
{ {
FLUID_LOG(FLUID_ERR, "Can't set device buffer size"); FLUID_LOG(FLUID_ERR, "Can't set device buffer size");
@ -355,9 +355,18 @@ new_fluid_oss_audio_driver2(fluid_settings_t *settings, fluid_audio_func_t func,
} }
} }
if(stat(devname, &devstat) == -1) dev->dspfd = open(devname, O_WRONLY, 0);
if(dev->dspfd == -1)
{ {
FLUID_LOG(FLUID_ERR, "Device <%s> does not exists", devname); FLUID_LOG(FLUID_ERR, "Device <%s> could not be opened for writing: %s",
devname, g_strerror(errno));
goto error_recovery;
}
if(fstat(dev->dspfd, &devstat) == -1)
{
FLUID_LOG(FLUID_ERR, "fstat failed on device <%s>: %s", devname, g_strerror(errno));
goto error_recovery; goto error_recovery;
} }
@ -367,16 +376,6 @@ new_fluid_oss_audio_driver2(fluid_settings_t *settings, fluid_audio_func_t func,
goto error_recovery; goto error_recovery;
} }
dev->dspfd = open(devname, O_WRONLY, 0);
if(dev->dspfd == -1)
{
FLUID_LOG(FLUID_ERR, "Device <%s> could not be opened for writing: %s",
devname, strerror(errno));
goto error_recovery;
}
if(fluid_oss_set_queue_size(dev, 16, 2, queuesize, period_size) < 0) if(fluid_oss_set_queue_size(dev, 16, 2, queuesize, period_size) < 0)
{ {
FLUID_LOG(FLUID_ERR, "Can't set device buffer size"); FLUID_LOG(FLUID_ERR, "Can't set device buffer size");
@ -699,7 +698,7 @@ new_fluid_oss_midi_driver(fluid_settings_t *settings,
if(fcntl(dev->fd, F_SETFL, O_NONBLOCK) == -1) if(fcntl(dev->fd, F_SETFL, O_NONBLOCK) == -1)
{ {
FLUID_LOG(FLUID_ERR, "Failed to set OSS MIDI device to non-blocking: %s", FLUID_LOG(FLUID_ERR, "Failed to set OSS MIDI device to non-blocking: %s",
strerror(errno)); g_strerror(errno));
goto error_recovery; goto error_recovery;
} }
@ -788,7 +787,7 @@ fluid_oss_midi_run(void *d)
if(n < 0) if(n < 0)
{ {
FLUID_LOG(FLUID_ERR, "Error waiting for MIDI input: %s", strerror(errno)); FLUID_LOG(FLUID_ERR, "Error waiting for MIDI input: %s", g_strerror(errno));
break; break;
} }