summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-09-28 00:30:48 +0000
committerLennart Poettering <lennart@poettering.net>2007-09-28 00:30:48 +0000
commit584ca6193c41c2fbe8e0d7acf7075a0eb33b1090 (patch)
tree87b1cd9d2b9d1a7d41d95aa4e9297705953804d7
parent107f12ae3ccc95f124d2659e062f5d1f4093dc02 (diff)
don't free silence memblocks that don't exist
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1910 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--src/pulsecore/sink-input.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c
index ce48765a..6f654b61 100644
--- a/src/pulsecore/sink-input.c
+++ b/src/pulsecore/sink-input.c
@@ -540,9 +540,10 @@ void pa_sink_input_drop(pa_sink_input *i, size_t length) {
}
if (i->thread_info.move_silence <= 0) {
- pa_assert(i->thread_info.silence_memblock);
- pa_memblock_unref(i->thread_info.silence_memblock);
- i->thread_info.silence_memblock = NULL;
+ if (i->thread_info.silence_memblock) {
+ pa_memblock_unref(i->thread_info.silence_memblock);
+ i->thread_info.silence_memblock = NULL;
+ }
}
if (length <= 0)