Merge commit '91be1103fd1f79d381edf268c32f4166b6c3b6d8'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Sep 2013 11:20:42 +0000 (13:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Sep 2013 11:20:42 +0000 (13:20 +0200)
* commit '91be1103fd1f79d381edf268c32f4166b6c3b6d8':
  wnv1: Make sure the input packet is large enough

Conflicts:
libavcodec/wnv1.c

See: f23a2418fb0ccc56fdae4dbf83a5994cc917c475
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/wnv1.c

@@@ -68,8 -70,8 +68,8 @@@ static int decode_frame(AVCodecContext 
      int prev_y = 0, prev_u = 0, prev_v = 0;
      uint8_t *rbuf;
  
-     if(buf_size<=8) {
-         av_log(avctx, AV_LOG_ERROR, "buf_size %d is too small\n", buf_size);
 -    if (buf_size < 8) {
 -        av_log(avctx, AV_LOG_ERROR, "Packet is too short\n");
++    if (buf_size <= 8) {
++        av_log(avctx, AV_LOG_ERROR, "Packet size %d is too small\n", buf_size);
          return AVERROR_INVALIDDATA;
      }