diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-03 20:01:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-10 02:13:07 +0200 |
| commit | f43127a51602aec8fdcd7fe4b56f5aab77a9e1df (patch) | |
| tree | e52546a10a73335e17defdb2a77f28147c31c74a | |
| parent | 0c50e41d63f0e3a5580a6ded4cb7ff8d28538dc5 (diff) | |
| download | ffmpeg-f43127a51602aec8fdcd7fe4b56f5aab77a9e1df.tar.gz | |
avformat/rmdec: Check codec_data_size
Fixes infinite loop
Fixes Ticket4154
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a6f730730b82645a9d31aad0968487cb77d6946c)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/rmdec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 2c4ed49c12..5a8c6dc160 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -309,6 +309,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); |