oggdec_filter.ggo: Add more documentation.

[paraslash.git] / oggdec.c

diff --git a/oggdec.c b/oggdec.c
index 4c8aae5f9a04eb9a0e933e2a51e871229a5987c0..e22ea1e464fa083c108c1474c37c802fa6b64659 100644 (file)
--- a/oggdec.c
+++ b/oggdec.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-/** \file oggdec.c paraslash's ogg vorbis decoder */
+/** \file oggdec.c Paraslash's ogg vorbis decoder. */
 
 #include "para.h"
 
@@ -58,7 +58,8 @@ static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
 }
 
 /*
- * cb_seek -- custom data seeking function
+ * Custom data seeking function.
+ *
  * Since we want the data source to be treated as unseekable at all
  * times, the provided seek callback always returns -1 (failure).
  */
@@ -78,8 +79,8 @@ static const ov_callbacks ovc = {
        .seek_func = cb_seek,
        .close_func = cb_close,
        /*
-        * The tell function need not be provided if
-        * the data IO abstraction is not seekable
+        * The tell function need not be provided if the data IO abstraction is
+        * not seekable
         */
        .tell_func = NULL
 };
@@ -149,7 +150,7 @@ static ssize_t ogg_convert(char *inbuffer, size_t len, struct filter_node *fn)
                PARA_NOTICE_LOG("%d channels, %d Hz\n", fn->fc->channels,
                        fn->fc->samplerate);
        }
-       while (!*fn->fc->input_error && fn->loaded < fn->bufsize) {
+       while (fn->loaded < fn->bufsize) {
                int length = fn->bufsize - fn->loaded;
                long read_ret = ov_read(pod->vf, fn->buf + fn->loaded, length,
                        ENDIAN, 2 /* 16 bit */, 1 /* signed */, NULL);
@@ -164,10 +165,24 @@ static ssize_t ogg_convert(char *inbuffer, size_t len, struct filter_node *fn)
 
 static void *oggdec_parse_config(int argc, char **argv)
 {
-       struct oggdec_filter_args_info *ret = para_calloc(sizeof(struct oggdec_filter_args_info));
-       if (!oggdec_cmdline_parser(argc, argv, ret))
-               return ret;
-       free(ret);
+       int ret;
+       struct oggdec_filter_args_info *ogg_conf;
+
+       ogg_conf = para_calloc(sizeof(*ogg_conf));
+       ret = oggdec_cmdline_parser(argc, argv, ogg_conf);
+       if (ret)
+               goto err;
+       if (ogg_conf->bufsize_arg < 0)
+               goto err;
+       if (ogg_conf->bufsize_arg >= INT_MAX / 1024)
+               goto err;
+       if (ogg_conf->initial_buffer_arg < 0)
+               goto err;
+       if (ogg_conf->initial_buffer_arg >= INT_MAX / 1024)
+               goto err;
+       return ogg_conf;
+err:
+       free(ogg_conf);
        return NULL;
 }