oggdec: Fix EOF handling on repositioning.

[paraslash.git] / oggdec_filter.c

diff --git a/oggdec_filter.c b/oggdec_filter.c
index 16c8d907f01fab92fa6c1c74435920448da5349f..9498313c6ca42cb1cbe2c3e792b88f8f381d1d14 100644 (file)
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -208,9 +208,13 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
        char *buf;
 
        ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
-       if (ret < 0 && ret != -E_BTR_EOF) /* fatal error */
-               goto out;
-       if (ret <= 0 && !pod->have_more) /* nothing to do */
+       if (ret < 0) {
+               if (ret != -E_BTR_EOF) /* fatal error */
+                       goto out;
+               if (fn->min_iqs == 0 && !pod->have_more) /* EOF */
+                       goto out;
+               /* last ov_read() returned OV_HOLE */
+       } else if (ret == 0 && !pod->have_more) /* nothing to do */
                goto out;
        if (btr_get_output_queue_size(btrn) > OGGDEC_MAX_OUTPUT_SIZE)
                return;