diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-06 00:18:29 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 00:26:12 +0100 |
commit | 564d943b2755a00df6857a86eb57101609f4b5a0 (patch) | |
tree | 9f26b3962c3bb13beda26d554126bbb34f961620 | |
parent | aded1110a32e7a14569d9128992c43fee18a2ed8 (diff) | |
download | ffmpeg-564d943b2755a00df6857a86eb57101609f4b5a0.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 d281228f0d..59bbef685a 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -414,7 +414,11 @@ int 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; } |