From: Peter Ross <pross@xvid.org>
Date: Tue, 24 Nov 2009 07:08:17 +0000 (+0000)
Subject: Determine VOC block length when length field is zero, fixes issue1538.
X-Git-Tag: v0.6~2587
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c351524c9e7f90be8e11eccc7bac405505e4bb76;p=platform%2Fupstream%2Flibav.git

Determine VOC block length when length field is zero, fixes issue1538.

Originally committed as revision 20596 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavformat/voc.h b/libavformat/voc.h
index 7993146..3f995ad 100644
--- a/libavformat/voc.h
+++ b/libavformat/voc.h
@@ -26,7 +26,7 @@
 #include "riff.h"    /* for CodecTag */
 
 typedef struct voc_dec_context {
-    int remaining_size;
+    int64_t remaining_size;
 } VocDecContext;
 
 typedef enum voc_type {
diff --git a/libavformat/vocdec.c b/libavformat/vocdec.c
index 94fbd7b..246dbd9 100644
--- a/libavformat/vocdec.c
+++ b/libavformat/vocdec.c
@@ -76,6 +76,11 @@ voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size)
         if (type == VOC_TYPE_EOF)
             return AVERROR(EIO);
         voc->remaining_size = get_le24(pb);
+        if (!voc->remaining_size) {
+            if (url_is_streamed(s->pb))
+                return AVERROR(EIO);
+            voc->remaining_size = url_fsize(pb) - url_ftell(pb);
+        }
         max_size -= 4;
 
         switch (type) {