Merge commit 'c9c7d59b7d26f0328d612995dd9256337ae1cbfb'

* commit 'c9c7d59b7d26f0328d612995dd9256337ae1cbfb':
  tiff: Use av_mallocz_array

Conflicts:
	libavcodec/tiffenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/tiffenc.c
index 138d214,b28f72b..38ff780
--- 1/libavcodec/tiffenc.c
--- 2/libavcodec/tiffenc.c
+++ b/libavcodec/tiffenc.c
@@@ -327,10 -312,9 +327,14 @@@ static int encode_frame(AVCodecContext 
      offset = ptr;
      bytestream_put_le32(&ptr, 0);
  
 -    strip_sizes   = av_mallocz_array(strips, sizeof(*strip_sizes));
 -    strip_offsets = av_mallocz_array(strips, sizeof(*strip_offsets));
 -    if (!strip_sizes || !strip_offsets) {
++    if (strips > INT_MAX / FFMAX(sizeof(s->strip_sizes[0]), sizeof(s->strip_offsets[0]))) {
++        ret = AVERROR(ENOMEM);
++        goto fail;
++    }
 +    av_fast_padded_mallocz(&s->strip_sizes  , &s->strip_sizes_size  , sizeof(s->strip_sizes  [0]) * strips);
 +    av_fast_padded_mallocz(&s->strip_offsets, &s->strip_offsets_size, sizeof(s->strip_offsets[0]) * strips);
 +
 +    if (!s->strip_sizes || !s->strip_offsets) {
          ret = AVERROR(ENOMEM);
          goto fail;
      }