mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-12-16 08:56:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed segfault in rate conversions.

Browse source
This commit is contained in:
Takashi Iwai 2002-03-08 14:29:09 +00:00
parent e95743c33f
commit 9fc594f47b
1 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/pcm/pcm_plugin.c
View file

@ -334,12 +334,19 @@ static snd_pcm_sframes_t snd_pcm_plugin_write_areas(snd_pcm_t *pcm,
snd_atomic_write_begin(&plugin->watom); snd_atomic_write_begin(&plugin->watom);
snd_pcm_mmap_appl_forward(pcm, frames); snd_pcm_mmap_appl_forward(pcm, frames);
result = snd_pcm_mmap_commit(slave, slave_offset, slave_frames); result = snd_pcm_mmap_commit(slave, slave_offset, slave_frames);
if (result > 0 && (snd_pcm_uframes_t)result != slave_frames) {
snd_pcm_sframes_t res;
res = plugin->undo_write(pcm, slave_areas, slave_offset + result, slave_frames, slave_frames - result);
if (res < 0)
return xfer > 0 ? xfer : res;
frames -= res;
}
snd_atomic_write_end(&plugin->watom); snd_atomic_write_end(&plugin->watom);
if (result <= 0) if (result <= 0)
return xfer > 0 ? xfer : result; return xfer > 0 ? xfer : result;
offset += result; offset += frames;
xfer += result; xfer += frames;
size -= result; size -= frames;
} }
return xfer; return xfer;
} }
@ -369,12 +376,20 @@ static snd_pcm_sframes_t snd_pcm_plugin_read_areas(snd_pcm_t *pcm,
snd_atomic_write_begin(&plugin->watom); snd_atomic_write_begin(&plugin->watom);
snd_pcm_mmap_appl_forward(pcm, frames); snd_pcm_mmap_appl_forward(pcm, frames);
result = snd_pcm_mmap_commit(slave, slave_offset, slave_frames); result = snd_pcm_mmap_commit(slave, slave_offset, slave_frames);
if (result > 0 && (snd_pcm_uframes_t)result != slave_frames) {
snd_pcm_sframes_t res;
res = plugin->undo_read(slave, areas, offset, frames, slave_frames - result);
if (res < 0)
return xfer > 0 ? xfer : res;
frames -= res;
}
snd_atomic_write_end(&plugin->watom); snd_atomic_write_end(&plugin->watom);
if (result <= 0) if (result <= 0)
return xfer > 0 ? xfer : result; return xfer > 0 ? xfer : result;
offset += result; offset += frames;
xfer += result; xfer += frames;
size -= result; size -= frames;
} }
return xfer; return xfer;
} }