Merge commit '459f2b393a3f89ed08d10fbceb4738d1429f268e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Sep 2013 12:10:17 +0000 (14:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Sep 2013 12:10:17 +0000 (14:10 +0200)
* commit '459f2b393a3f89ed08d10fbceb4738d1429f268e':
  mpc8: Check the seek table size parsed from the bitstream

Conflicts:
libavformat/mpc8.c

See: b61ba262a1e275f8129b7383d70fe48051b47fcf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mpc8.c

index 73b7eb7..9e7aa9a 100644 (file)
@@ -151,7 +151,7 @@ static void mpc8_parse_seektable(AVFormatContext *s, int64_t off)
         return;
     }
     if (size > INT_MAX/10 || size<=0) {
-        av_log(s, AV_LOG_ERROR, "Seek table size is invalid\n");
+        av_log(s, AV_LOG_ERROR, "Bad seek table size\n");
         return;
     }
     if(!(buf = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE)))