Merge commit 'de41b555cdea2dcacbe98ee9edc83a8c15c73c4c'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 10 Nov 2015 16:58:14 +0000 (17:58 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 10 Nov 2015 16:58:14 +0000 (17:58 +0100)
* commit 'de41b555cdea2dcacbe98ee9edc83a8c15c73c4c':
  truemotion2: Fix the buffer check

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/truemotion2.c

index 75373a095b993382185d100d6bdd51b89de6ee93..7912d3909e8055f97956e1a35cb7d3882d21904e 100644 (file)
@@ -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;
     }