http_recv: set the eof flag on buffer overruns.

[paraslash.git] / oggdec.c

diff --git a/oggdec.c b/oggdec.c
index 4ef16b0886673759c3f8308041906a433dd7824c..e1c4517ec94e3cda5e5ba92d86485ec47666aef6 100644 (file)
--- a/oggdec.c
+++ b/oggdec.c
@@ -18,11 +18,11 @@
 
 /** \file oggdec.c paraslash's ogg vorbis decoder */
 
-#include "gcc-compat.h"
 #include "para.h"
 
 #include "oggdec_filter.cmdline.h"
 #include "list.h"
+#include "sched.h"
 #include "filter.h"
 #include "error.h"
 #include "string.h"
@@ -54,15 +54,15 @@ static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
        size_t ret, have = pod->inbuf_len - pod->converted;
        char *p = pod->inbuf + pod->converted;
 
-       if (*fn->fci->eof)
-               return 0;
 //     PARA_DEBUG_LOG("pod = %p\n", pod);
 //     PARA_DEBUG_LOG("vorbis requests %d bytes, have %d\n", size * nmemb, have);
        if (pod->inbuf_len < size) {
+               if (*fn->fc->input_eof)
+                       return 0;
                errno = EAGAIN;
                return -1;
        }
-       ret = MIN(nmemb, have / size) * size;
+       ret = PARA_MIN(nmemb, have / size) * size;
        memcpy(buf, p, ret);
        pod->converted += ret;
        return ret;
@@ -73,13 +73,13 @@ static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
  * Since we want the data source to be treated as unseekable at all
  * times, the provided seek callback always returns -1 (failure).
  */
-static int cb_seek(__unused void *datasource, __unused ogg_int64_t offset,
-               __unused int whence)
+static int cb_seek(__a_unused void *datasource, __a_unused ogg_int64_t offset,
+               __a_unused int whence)
 {
        return -1;
 }
 
-static int cb_close(__unused void *datasource)
+static int cb_close(__a_unused void *datasource)
 {
        return 0;
 }
@@ -99,7 +99,7 @@ static void ogg_open(struct filter_node *fn)
 {
        struct private_oggdec_data *pod = para_calloc(
                sizeof(struct private_oggdec_data));
-       struct gengetopt_args_info *conf = fn->conf;
+       struct oggdec_filter_args_info *conf = fn->conf;
 
        fn->private_data = pod;
        fn->bufsize = conf->bufsize_arg * 1024;
@@ -126,7 +126,7 @@ static ssize_t ogg_convert(char *inbuffer, size_t len, struct filter_node *fn)
 {
        ssize_t ret;
        struct private_oggdec_data *pod = fn->private_data;
-       struct gengetopt_args_info *conf = fn->conf;
+       struct oggdec_filter_args_info *conf = fn->conf;
        /* make the buffer known to the read callback cb_read() */
        pod->inbuf = inbuffer;
        pod->inbuf_len = len;
@@ -134,13 +134,13 @@ static ssize_t ogg_convert(char *inbuffer, size_t len, struct filter_node *fn)
 
        if (!pod->vf) {
                int ib = 1024 * conf->initial_buffer_arg; /* initial buffer */
-               if (len <ib && !*fn->fci->eof && !fn->fci->error) {
-                       PARA_INFO_LOG("initial input buffer %d/%d, waiting for more data\n",
+               if (len <ib && !*fn->fc->input_eof) {
+                       PARA_INFO_LOG("initial input buffer %zd/%d, waiting for more data\n",
                                len, ib);
                        return 0;
                }
                pod->vf = para_malloc(sizeof(struct OggVorbis_File));
-               PARA_NOTICE_LOG("input buffer: %d, opening ov callbacks\n", len);
+               PARA_NOTICE_LOG("input buffer: %zd, opening ov callbacks\n", len);
                ret = ov_open_callbacks(fn, pod->vf,
                        NULL, /* no initial buffer */
                        0, /* no initial bytes */
@@ -155,9 +155,9 @@ static ssize_t ogg_convert(char *inbuffer, size_t len, struct filter_node *fn)
                        return -E_OGGDEC_BADHEADER;
                if (ret < 0)
                        return -E_OGGDEC_FAULT;
-               fn->fci->channels = ov_info(pod->vf, 0)->channels;
-               fn->fci->samplerate = ov_info(pod->vf, 0)->rate;
-               PARA_NOTICE_LOG("%d channels, %d Hz\n", fn->fci->channels, fn->fci->samplerate);
+               fn->fc->channels = ov_info(pod->vf, 0)->channels;
+               fn->fc->samplerate = ov_info(pod->vf, 0)->rate;
+               PARA_NOTICE_LOG("%d channels, %d Hz\n", fn->fc->channels, fn->fc->samplerate);
        }
 again:
        ret = ov_read(pod->vf, fn->buf + fn->loaded, fn->bufsize - fn->loaded,
@@ -168,14 +168,14 @@ again:
        if (ret < 0)
                return -E_OGGDEC_BADLINK;
        fn->loaded += ret;
-       if (!*fn->fci->eof && !fn->fci->error && fn->loaded < fn->bufsize)
+       if (!*fn->fc->input_eof && fn->loaded < fn->bufsize)
                goto again;
        return pod->converted;
 }
 
 static void *oggdec_parse_config(int argc, char **argv)
 {
-       struct gengetopt_args_info *ret = para_calloc(sizeof(struct gengetopt_args_info));
+       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);