summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-18 21:37:54 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-18 21:47:03 +0100
commitaf3f2a87da1d37e5f227c1c289f62e84422879c2 (patch)
treea19bbb32d4689c322af39f92aa696148e0faba6e /libavformat
parent7859740c6a2f9bc3dd247dc63b8e7cbd6181a5dd (diff)
mov: detect EOF in mov_read_dref()
This fixes a (near) infinite loop and Ticket783 Bug found by: cosminamironesei Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mov.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 38248d45a2..3aa9381e54 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -431,6 +431,8 @@ static int mov_read_dref(MOVContext *c, AVIOContext *pb, MOVAtom atom)
avio_skip(pb, 16);
for (type = 0; type != -1 && avio_tell(pb) < next; ) {
+ if(url_feof(pb))
+ return AVERROR(EOF);
type = avio_rb16(pb);
len = avio_rb16(pb);
av_log(c->fc, AV_LOG_DEBUG, "type %d, len %d\n", type, len);