mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-04 13:30:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pcm_file: improve error checking in write_wav_header function

Browse source 
previously errno would be returned even for cases where it may have
not been populated, for example one of the write functions failing,
or writing only partial buffer,

now progress through write operations separately and report errno when
appropriate

Signed-off-by: Adam Miartus <amiartus@de.adit-jv.com>
Reviewed-by: Timo Wischer <twischer@de.adit-jv.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Adam Miartus 2019-07-05 16:40:48 +02:00 • committed by Takashi Iwai
parent de1a9b2e81
commit d7ee2a9a30
1 changed files with 30 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/pcm/pcm_file.c
View file

@ -327,6 +327,8 @@ static void setup_wav_header(snd_pcm_t *pcm, struct wav_fmt *fmt)
static int write_wav_header(snd_pcm_t *pcm) static int write_wav_header(snd_pcm_t *pcm)
{ {
snd_pcm_file_t *file = pcm->private_data; snd_pcm_file_t *file = pcm->private_data;
ssize_t res;
static const char header[] = { static const char header[] = {
'R', 'I', 'F', 'F', 'R', 'I', 'F', 'F',
0x24, 0, 0, 0, 0x24, 0, 0, 0,
@ -341,15 +343,35 @@ static int write_wav_header(snd_pcm_t *pcm)
setup_wav_header(pcm, &file->wav_header); setup_wav_header(pcm, &file->wav_header);
if (write(file->fd, header, sizeof(header)) != sizeof(header) || res = write(file->fd, header, sizeof(header));
write(file->fd, &file->wav_header, sizeof(file->wav_header)) != if (res != sizeof(header))
sizeof(file->wav_header) || goto write_error;
write(file->fd, header2, sizeof(header2)) != sizeof(header2)) {
int err = errno; res = write(file->fd, &file->wav_header, sizeof(file->wav_header));
SYSERR("%s write header failed, file data may be corrupt", file->fname); if (res != sizeof(file->wav_header))
return -err; goto write_error;
}
res = write(file->fd, header2, sizeof(header2));
if (res != sizeof(header2))
goto write_error;
return 0; return 0;
write_error:
/*
* print real errno if available and return EIO, reason for this is
* to block possible EPIPE in case file->fd is a pipe. EPIPE from
* file->fd conflicts with EPIPE from playback stream which should
* be used to signal XRUN on playback device
*/
if (res < 0)
SYSERR("%s write header failed, file data may be corrupt", file->fname);
else
SNDERR("%s write header incomplete, file data may be corrupt", file->fname);
memset(&file->wav_header, 0, sizeof(struct wav_fmt));
return -EIO;
} }
/* fix up the length fields in WAV header */ /* fix up the length fields in WAV header */