diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-06 00:18:29 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-12 17:10:35 +0100 |
commit | a443b48ccfca1ac82f86f9402c3f4f06d727826d (patch) | |
tree | 51090e8403420510f7c91c1f75019660fd1796f9 | |
parent | a45402d4c0afca2fc8ba656fddc502ddb4914b1a (diff) | |
download | ffmpeg-a443b48ccfca1ac82f86f9402c3f4f06d727826d.tar.gz |
avformat/rmdec: Check for overflow in ff_rm_read_mdpr_codecdata()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 03abf55f252945c70f4a79eaf4d609cee4d98710)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavformat/rmdec.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 19bd7a7a0b..65982efe79 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -412,7 +412,11 @@ ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVIOContext *pb, skip: /* skip codec info */ size = avio_tell(pb) - codec_pos; - avio_skip(pb, codec_data_size - size); + if (codec_data_size >= size) { + avio_skip(pb, codec_data_size - size); + } else { + av_log(s, AV_LOG_WARNING, "codec_data_size %u < size %d\n", codec_data_size, size); + } return 0; } |