aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2010-11-08 10:37:09 +0100
committerMax Kellermann <max@duempel.org>2010-11-08 10:37:09 +0100
commitad52eb236d8746dffce0a5b07bf58a62bf0835d8 (patch)
treeb067a48045b10714e6c1315352bd9fad42202e67
parent462bba8e2ffc46ec5c3daf4bb0c174a8d72ae1c3 (diff)
downloadmpd-ad52eb236d8746dffce0a5b07bf58a62bf0835d8.tar.gz
mpd-ad52eb236d8746dffce0a5b07bf58a62bf0835d8.tar.xz
mpd-ad52eb236d8746dffce0a5b07bf58a62bf0835d8.zip
input/rewind: fix assertion failure
The assertion added in MPD 0.15.14 was too much, it failed when the MIME type of a stream was NULL.
Diffstat (limited to '')
-rw-r--r--NEWS2
-rw-r--r--src/input/rewind_input_plugin.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index db85d23fc..1c7d4dc1e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
ver 0.15.15 (2010/??/??)
+* input:
+ - rewind: fix assertion failure
ver 0.15.14 (2010/11/06)
diff --git a/src/input/rewind_input_plugin.c b/src/input/rewind_input_plugin.c
index 1927c525a..9e57e6999 100644
--- a/src/input/rewind_input_plugin.c
+++ b/src/input/rewind_input_plugin.c
@@ -84,7 +84,7 @@ copy_attributes(struct input_stream *dest)
const struct input_stream *src = &r->input;
assert(dest != src);
- assert(dest->mime != src->mime);
+ assert(src->mime == NULL || dest->mime != src->mime);
dest->ready = src->ready;
dest->seekable = src->seekable;