summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-03 20:01:18 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-03 20:01:18 +0100
commita6f730730b82645a9d31aad0968487cb77d6946c (patch)
tree816a2f57d9940df4e94421f864a7124c28a334db
parenteac5c7b8377f3f0e8262ab44e5ccb2c7ed060cdd (diff)
downloadffmpeg-a6f730730b82645a9d31aad0968487cb77d6946c.tar.gz
avformat/rmdec: Check codec_data_size
Fixes infinite loop Fixes Ticket4154 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/rmdec.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index c46b53f335..19bd7a7a0b 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -312,6 +312,9 @@ ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVIOContext *pb,
int64_t codec_pos;
int ret;
+ if (codec_data_size < 0)
+ return AVERROR_INVALIDDATA;
+
avpriv_set_pts_info(st, 64, 1, 1000);
codec_pos = avio_tell(pb);
v = avio_rb32(pb);