Merge remote-tracking branch 'qatar/release/9' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Jun 2013 09:06:28 +0000 (11:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Jun 2013 09:06:28 +0000 (11:06 +0200)
* qatar/release/9:
  tiff: do not overread the source buffer
  apetag: use int64_t for filesize

Conflicts:
libavcodec/tiff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/tiff.c
libavformat/apetag.c

@@@ -553,12 -218,7 +554,8 @@@ static int tiff_unpack_strip(TiffContex
                                 "Copy went out of bounds\n");
                          return -1;
                      }
-                     if (ssrc + size - src < code) {
-                         av_log(s->avctx, AV_LOG_ERROR, "Read went out of bounds\n");
-                         return AVERROR_INVALIDDATA;
-                     }
 -                    memcpy(dst + pixels, src, code);
 +                    horizontal_fill(s->bpp * (s->avctx->pix_fmt == AV_PIX_FMT_PAL8),
 +                                    dst, 1, src, 0, code, pixels);
                      src += code;
                      pixels += code;
                  } else if (code != -128) { // -127..-1
Simple merge