/*
- * 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.
*/
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);
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;
}
/**