mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-03 09:01:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pcm_file: coverity fixes (including double locking)

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2019-05-27 13:57:12 +02:00
parent ed156a2186
commit 022c790aab
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/pcm/pcm_file.c
View file

@ -296,7 +296,10 @@ static int snd_pcm_file_areas_read_infile(snd_pcm_t *pcm,
return -ENOMEM; return -ENOMEM;
} }
bytes = read(file->ifd, file->rbuf, snd_pcm_frames_to_bytes(pcm, frames)); bytes = snd_pcm_frames_to_bytes(pcm, frames);
if (bytes < 0)
return bytes;
bytes = read(file->ifd, file->rbuf, bytes);
if (bytes < 0) { if (bytes < 0) {
SYSERR("read from file failed, error: %d", bytes); SYSERR("read from file failed, error: %d", bytes);
return bytes; return bytes;
@ -589,18 +592,14 @@ static snd_pcm_sframes_t snd_pcm_file_readi(snd_pcm_t *pcm, void *buffer, snd_pc
snd_pcm_channel_area_t areas[pcm->channels]; snd_pcm_channel_area_t areas[pcm->channels];
snd_pcm_sframes_t frames; snd_pcm_sframes_t frames;
__snd_pcm_lock(pcm);
frames = _snd_pcm_readi(file->gen.slave, buffer, size); frames = _snd_pcm_readi(file->gen.slave, buffer, size);
if (frames <= 0) { if (frames <= 0)
__snd_pcm_unlock(pcm);
return frames; return frames;
}
snd_pcm_areas_from_buf(pcm, areas, buffer); snd_pcm_areas_from_buf(pcm, areas, buffer);
snd_pcm_file_areas_read_infile(pcm, areas, 0, frames); snd_pcm_file_areas_read_infile(pcm, areas, 0, frames);
__snd_pcm_lock(pcm);
snd_pcm_file_add_frames(pcm, areas, 0, frames); snd_pcm_file_add_frames(pcm, areas, 0, frames);
__snd_pcm_unlock(pcm); __snd_pcm_unlock(pcm);
return frames; return frames;
@ -654,9 +653,6 @@ static int snd_pcm_file_mmap_begin(snd_pcm_t *pcm, const snd_pcm_channel_area_t
snd_pcm_uframes_t *offset, snd_pcm_uframes_t *frames) snd_pcm_uframes_t *offset, snd_pcm_uframes_t *frames)
{ {
snd_pcm_file_t *file = pcm->private_data; snd_pcm_file_t *file = pcm->private_data;
snd_pcm_channel_area_t areas_if[pcm->channels];
snd_pcm_uframes_t frames_if;
void *buffer = NULL;
int result; int result;
result = snd_pcm_mmap_begin(file->gen.slave, areas, offset, frames); result = snd_pcm_mmap_begin(file->gen.slave, areas, offset, frames);