From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 3 Dec 2014 19:01:18 +0000 (+0100)
Subject: avformat/rmdec: Check codec_data_size
X-Git-Tag: android-x86-6.0-r1~1627
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a6f730730b82645a9d31aad0968487cb77d6946c;p=android-x86%2Fexternal-ffmpeg.git

avformat/rmdec: Check codec_data_size

Fixes infinite loop
Fixes Ticket4154

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

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);