oggdec_filter.ggo: Add more documentation.

[paraslash.git] / oggdec.c

diff --git a/oggdec.c b/oggdec.c
index de9e23792ef8587bfde932e4e092bd0427e9fe7a..e22ea1e464fa083c108c1474c37c802fa6b64659 100644 (file)
--- a/oggdec.c
+++ b/oggdec.c
@@ -1,5 +1,5 @@
 /*
- * 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.
  */
@@ -150,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);
@@ -165,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;
 }