Merge commit 'c9c7d59b7d26f0328d612995dd9256337ae1cbfb'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Nov 2014 23:08:06 +0000 (00:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Nov 2014 23:08:06 +0000 (00:08 +0100)
* commit 'c9c7d59b7d26f0328d612995dd9256337ae1cbfb':
  tiff: Use av_mallocz_array

Conflicts:
libavcodec/tiffenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/tiffenc.c

index 138d214c2f7d4969ce0cd5fea659bab7468d96ef..38ff780da3bbd5df4af6376a7359502deef1ffa7 100644 (file)
@@ -327,6 +327,10 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
     offset = ptr;
     bytestream_put_le32(&ptr, 0);
 
+    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);