diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-07-12 20:31:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-07-12 20:36:13 +0200 |
| commit | a82468514048fb87d9bf38689866bc3b9aaccd02 (patch) | |
| tree | 844461160b27fa82feb6b5d3987ab00c8e73cd02 /libavcodec/ivi.c | |
| parent | 341f01290c2353669ed2263f56e1a9f4c67cc597 (diff) | |
| download | ffmpeg-streaming-a82468514048fb87d9bf38689866bc3b9aaccd02.zip ffmpeg-streaming-a82468514048fb87d9bf38689866bc3b9aaccd02.tar.gz | |
avcodec/ivi: Use av_image_check_size2()
Fixes OOM
Fixes: 1514/clusterfuzz-testcase-minimized-6437666243477504
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/ivi.c')
| -rw-r--r-- | libavcodec/ivi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/ivi.c b/libavcodec/ivi.c index 866f066..cea40d8 100644 --- a/libavcodec/ivi.c +++ b/libavcodec/ivi.c @@ -302,7 +302,7 @@ static av_cold void ivi_free_buffers(IVIPlaneDesc *planes) } } -av_cold int ff_ivi_init_planes(IVIPlaneDesc *planes, const IVIPicConfig *cfg, +av_cold int ff_ivi_init_planes(AVCodecContext *avctx, IVIPlaneDesc *planes, const IVIPicConfig *cfg, int is_indeo4) { int p, b; @@ -312,7 +312,7 @@ av_cold int ff_ivi_init_planes(IVIPlaneDesc *planes, const IVIPicConfig *cfg, ivi_free_buffers(planes); - if (av_image_check_size(cfg->pic_width, cfg->pic_height, 0, NULL) < 0 || + if (av_image_check_size2(cfg->pic_width, cfg->pic_height, avctx->max_pixels, AV_PIX_FMT_YUV410P, 0, avctx) < 0 || cfg->luma_bands < 1 || cfg->chroma_bands < 1) return AVERROR_INVALIDDATA; |
