oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/{alsa,oss}: add assertions

Browse Source
This commit is contained in:
Max Kellermann 2014-08-31 14:00:09 +02:00
parent 4efa96df21
commit af260b5a64
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/output/AlsaOutputPlugin.cxx
View File

@ -802,6 +802,7 @@ alsa_play(struct audio_output *ao, const void *chunk, size_t size,
{ {
AlsaOutput *ad = (AlsaOutput *)ao; AlsaOutput *ad = (AlsaOutput *)ao;
assert(size > 0);
assert(size % ad->in_frame_size == 0); assert(size % ad->in_frame_size == 0);
if (ad->must_prepare) { if (ad->must_prepare) {
@ -819,6 +820,7 @@ alsa_play(struct audio_output *ao, const void *chunk, size_t size,
assert(size % ad->out_frame_size == 0); assert(size % ad->out_frame_size == 0);
size /= ad->out_frame_size; size /= ad->out_frame_size;
assert(size > 0);
while (true) { while (true) {
snd_pcm_sframes_t ret = ad->writei(ad->pcm, chunk, size); snd_pcm_sframes_t ret = ad->writei(ad->pcm, chunk, size);

4
src/output/OssOutputPlugin.cxx
View File

@ -727,6 +727,8 @@ oss_output_play(struct audio_output *ao, const void *chunk, size_t size,
OssOutput *od = (OssOutput *)ao; OssOutput *od = (OssOutput *)ao;
ssize_t ret; ssize_t ret;
assert(size > 0);
/* reopen the device since it was closed by dropBufferedAudio */ /* reopen the device since it was closed by dropBufferedAudio */
if (od->fd < 0 && !oss_reopen(od, error)) if (od->fd < 0 && !oss_reopen(od, error))
return 0; return 0;
@ -735,6 +737,8 @@ oss_output_play(struct audio_output *ao, const void *chunk, size_t size,
chunk = od->pcm_export->Export(chunk, size, size); chunk = od->pcm_export->Export(chunk, size, size);
#endif #endif
assert(size > 0);
while (true) { while (true) {
ret = write(od->fd, chunk, size); ret = write(od->fd, chunk, size);
if (ret > 0) { if (ret > 0) {