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

Fix segfault with PCM rate plugin

Browse source 
Fix segfault with PCM rate plugin (bug#1878)
This commit is contained in:
Takashi Iwai 2006-03-02 17:01:58 +00:00
parent 09f598e57c
commit d730ff3556
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/pcm/pcm_rate.c
View file

@ -1297,13 +1297,24 @@ static int snd_pcm_rate_drain(snd_pcm_t *pcm)
if (pcm->stream == SND_PCM_STREAM_PLAYBACK) { if (pcm->stream == SND_PCM_STREAM_PLAYBACK) {
/* commit the remaining fraction (if any) */ /* commit the remaining fraction (if any) */
snd_pcm_uframes_t size, slave_size; snd_pcm_uframes_t size, ofs;
size = rate->appl_ptr - rate->last_commit_ptr; size = rate->appl_ptr - rate->last_commit_ptr;
if (size > 0) { ofs = rate->last_commit_ptr % pcm->buffer_size;
slave_size = snd_pcm_rate_slave_frames(pcm, size); while (size > 0) {
if (slave_size > 0) snd_pcm_uframes_t psize, spsize;
snd_pcm_rate_commit_area(pcm, rate, rate->last_commit_ptr % pcm->buffer_size, if (size > pcm->period_size) {
size, slave_size); psize = pcm->period_size;
spsize = rate->gen.slave->period_size;
} else {
psize = size;
spsize = snd_pcm_rate_slave_frames(pcm, size);
if (! spsize)
break;
}
snd_pcm_rate_commit_area(pcm, rate, ofs,
psize, spsize);
ofs = (ofs + psize) % pcm->buffer_size;
size -= psize;
} }
} }
return snd_pcm_drain(rate->gen.slave); return snd_pcm_drain(rate->gen.slave);