From ad52eb236d8746dffce0a5b07bf58a62bf0835d8 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 8 Nov 2010 10:37:09 +0100 Subject: 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. --- NEWS | 2 ++ src/input/rewind_input_plugin.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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; -- cgit v1.2.3