diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-10 17:58:14 +0100 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-10 17:58:14 +0100 |
commit | 0c1a6f577bbcb64dc26cf8edfc153728389a8c84 (patch) | |
tree | ba842920fd91cf2e8fa447448833bb6925f825a6 /libavcodec/truemotion2.c | |
parent | 446ac80ea594de6fca73dcba65fce8b06810fe96 (diff) | |
parent | de41b555cdea2dcacbe98ee9edc83a8c15c73c4c (diff) | |
download | ffmpeg-0c1a6f577bbcb64dc26cf8edfc153728389a8c84.tar.gz |
Merge commit 'de41b555cdea2dcacbe98ee9edc83a8c15c73c4c'
* commit 'de41b555cdea2dcacbe98ee9edc83a8c15c73c4c':
truemotion2: Fix the buffer check
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/truemotion2.c')
-rw-r--r-- | libavcodec/truemotion2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c index 75373a095b..7912d3909e 100644 --- a/libavcodec/truemotion2.c +++ b/libavcodec/truemotion2.c @@ -303,8 +303,8 @@ static int tm2_read_stream(TM2Context *ctx, const uint8_t *buf, int stream_id, i if (len == 0) return 4; - if (len >= INT_MAX/4-1 || len < 0 || skip > buf_size) { - av_log(ctx->avctx, AV_LOG_ERROR, "invalid stream size\n"); + if (len >= INT_MAX / 4 - 1 || len < 0 || skip > buf_size) { + av_log(ctx->avctx, AV_LOG_ERROR, "Error, invalid stream size.\n"); return AVERROR_INVALIDDATA; } |