Commit c351524c authored by Peter Ross's avatar Peter Ross

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

Originally committed as revision 20596 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent d90aeeaf
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "riff.h" /* for CodecTag */ #include "riff.h" /* for CodecTag */
typedef struct voc_dec_context { typedef struct voc_dec_context {
int remaining_size; int64_t remaining_size;
} VocDecContext; } VocDecContext;
typedef enum voc_type { typedef enum voc_type {
......
...@@ -76,6 +76,11 @@ voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size) ...@@ -76,6 +76,11 @@ voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size)
if (type == VOC_TYPE_EOF) if (type == VOC_TYPE_EOF)
return AVERROR(EIO); return AVERROR(EIO);
voc->remaining_size = get_le24(pb); 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; max_size -= 4;
switch (type) { switch (type) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment