# HG changeset patch # User pross # Date 1259046497 0 # Node ID 3528d151a57ed6653c1f1aee57a86d31ef7b890c # Parent 79b48fe3d753d7dd192ad7797dd0fd075c5a5d4a Determine VOC block length when length field is zero, fixes issue1538. diff -r 79b48fe3d753 -r 3528d151a57e voc.h --- a/voc.h Mon Nov 23 08:47:47 2009 +0000 +++ b/voc.h Tue Nov 24 07:08:17 2009 +0000 @@ -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 -r 79b48fe3d753 -r 3528d151a57e vocdec.c --- a/vocdec.c Mon Nov 23 08:47:47 2009 +0000 +++ b/vocdec.c Tue Nov 24 07:08:17 2009 +0000 @@ -76,6 +76,11 @@ 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) {