Browse Source

avcodec/g2meet: Check tile dimensions with av_image_check_size2()

Fixes: OOM
Fixes: 6216/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_G2M_fuzzer-4983807968018432

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n4.0
Michael Niedermayer 8 years ago
parent
commit
3981fb8d2a
1 changed files with 3 additions and 1 deletions
  1. +3
    -1
      libavcodec/g2meet.c

+ 3
- 1
libavcodec/g2meet.c View File

@@ -28,6 +28,7 @@
#include <inttypes.h>
#include <zlib.h>

#include "libavutil/imgutils.h"
#include "libavutil/intreadwrite.h"

#include "avcodec.h"
@@ -1451,7 +1452,8 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data,
c->tile_height = bytestream2_get_be32(&bc);
if (c->tile_width <= 0 || c->tile_height <= 0 ||
((c->tile_width | c->tile_height) & 0xF) ||
c->tile_width * (uint64_t)c->tile_height >= INT_MAX / 4
c->tile_width * (uint64_t)c->tile_height >= INT_MAX / 4 ||
av_image_check_size2(c->tile_width, c->tile_height, avctx->max_pixels, avctx->pix_fmt, 0, avctx) < 0
) {
av_log(avctx, AV_LOG_ERROR,
"Invalid tile dimensions %dx%d\n",


Loading…
Cancel
Save