Merge branch 'master' into next

[paraslash.git] / oggdec.c

diff --git a/oggdec.c b/oggdec.c
index b82f12ef8b994c605cb7f1699e0923d41738d365..b4befd01179ec58d2b9dc32afecd45914d3a93a8 100644 (file)
--- a/oggdec.c
+++ b/oggdec.c
@@ -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);
@@ -163,13 +163,29 @@ static ssize_t ogg_convert(char *inbuffer, size_t len, struct filter_node *fn)
        return pod->converted;
 }
 
-static void *oggdec_parse_config(int argc, char **argv)
+static int oggdec_parse_config(int argc, char **argv, void **config)
 {
-       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);
-       return NULL;
+       int ret;
+       struct oggdec_filter_args_info *ogg_conf;
+
+       ogg_conf = para_calloc(sizeof(*ogg_conf));
+       ret = -E_OGGDEC_SYNTAX;
+       if (oggdec_cmdline_parser(argc, argv, ogg_conf))
+               goto err;
+       ret = -ERRNO_TO_PARA_ERROR(EINVAL);
+       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;
+       *config = ogg_conf;
+       return 1;
+err:
+       free(ogg_conf);
+       return ret;
 }
 
 /**
@@ -177,7 +193,7 @@ static void *oggdec_parse_config(int argc, char **argv)
  *
  * \param f Its fields are filled in by the function.
  */
-void oggdec_init(struct filter *f)
+void oggdec_filter_init(struct filter *f)
 {
        f->open = ogg_open;
        f->close = ogg_close;