X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wav_filter.c;h=3c69311f570209cec4bed6abe27036d6d5754853;hp=b7329c48bce647b113638a5609b39de698ef81fd;hb=05ac3a8322555355fac0e224305a4a10a5d7caa2;hpb=00e4d4da1b2c00da139b09d3ed4ab9ad9fba2691

diff --git a/wav_filter.c b/wav_filter.c
index b7329c48..3c69311f 100644
--- a/wav_filter.c
+++ b/wav_filter.c
@@ -6,8 +6,10 @@
 
 /** \file wav_filter.c A filter that inserts a wave header. */
 
-#include "para.h"
+#include <regex.h>
 
+#include "para.h"
+#include "error.h"
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
@@ -31,7 +33,6 @@ static void make_wav_header(unsigned int channels, unsigned int samplerate,
 	int bytespersec = channels * samplerate * BITS / 8;
 	int align = channels * BITS / 8;
 
-	assert(channels);
 	PARA_DEBUG_LOG("writing wave header: %d channels, %d KHz\n", channels, samplerate);
 	memset(headbuf, 0, WAV_HEADER_LEN);
 	memcpy(headbuf, "RIFF", 4);
@@ -57,6 +58,10 @@ static ssize_t wav_convert(char *inbuf, size_t len, struct filter_node *fn)
 	if (*bof) {
 		if (!len)
 			return 0;
+		if (!fn->fc->channels || !fn->fc->samplerate) {
+			PARA_ERROR_LOG("%s\n", para_strerror(E_WAV_BAD_FC));
+			return -E_WAV_BAD_FC;
+		}
 		make_wav_header(fn->fc->channels, fn->fc->samplerate, fn);
 		fn->loaded = WAV_HEADER_LEN;
 		*bof = 0;