wav: Replace assertion by a proper error message.
authorAndre Noll <maan@systemlinux.org>
Wed, 18 Mar 2009 19:15:27 +0000 (20:15 +0100)
committerAndre Noll <maan@systemlinux.org>
Wed, 18 Mar 2009 19:15:27 +0000 (20:15 +0100)
This assertion can be hit easily by choosing wav as the first filter
of the filter chain.

error.h
wav_filter.c

diff --git a/error.h b/error.h
index 24f2a11..7de3f43 100644 (file)
--- a/error.h
+++ b/error.h
@@ -13,7 +13,6 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 
 /* these do not need error handling (yet) */
 #define SERVER_ERRORS
-#define WAV_FILTER_ERRORS
 #define TIME_ERRORS
 #define CLOSE_ON_FORK_ERRORS
 #define DAEMON_ERRORS
@@ -37,6 +36,10 @@ extern const char **para_errlist[];
        PARA_ERROR(COMPRESS_SYNTAX, "syntax error in compress filter config"), \
 
 
+#define WAV_FILTER_ERRORS \
+       PARA_ERROR(WAV_BAD_FC, "invalid filter chain configuration"), \
+
+
 #define FEC_ERRORS \
        PARA_ERROR(FEC_BAD_IDX, "invalid index vector"), \
        PARA_ERROR(FEC_SINGULAR, "unexpected singular matrix"), \
index b7329c4..1c0da18 100644 (file)
@@ -7,6 +7,7 @@
 /** \file wav_filter.c A filter that inserts a wave header. */
 
 #include "para.h"
+#include "error.h"
 
 #include "list.h"
 #include "sched.h"
@@ -31,7 +32,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 +57,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;