You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-04 22:03:09 +02:00
avcodec/cfhd: Check idwt_buf size before allocation
Fixes: OOM Fixes: 428760799/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CFHD_DEC_fuzzer-5685176435015680 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
@ -25,6 +25,7 @@
|
|||||||
|
|
||||||
#include "libavutil/attributes.h"
|
#include "libavutil/attributes.h"
|
||||||
#include "libavutil/common.h"
|
#include "libavutil/common.h"
|
||||||
|
#include "libavutil/imgutils.h"
|
||||||
#include "libavutil/intreadwrite.h"
|
#include "libavutil/intreadwrite.h"
|
||||||
#include "libavutil/mem.h"
|
#include "libavutil/mem.h"
|
||||||
#include "libavutil/pixdesc.h"
|
#include "libavutil/pixdesc.h"
|
||||||
@ -266,6 +267,9 @@ static int alloc_buffers(AVCodecContext *avctx)
|
|||||||
int height = (i || bayer) ? s->coded_height >> chroma_y_shift : s->coded_height;
|
int height = (i || bayer) ? s->coded_height >> chroma_y_shift : s->coded_height;
|
||||||
ptrdiff_t stride = (FFALIGN(width / 8, 8) + 64) * 8;
|
ptrdiff_t stride = (FFALIGN(width / 8, 8) + 64) * 8;
|
||||||
|
|
||||||
|
if ((ret = av_image_check_size2(stride, height, avctx->max_pixels, s->coded_format, 0, avctx)) < 0)
|
||||||
|
return ret;
|
||||||
|
|
||||||
if (chroma_y_shift && !bayer)
|
if (chroma_y_shift && !bayer)
|
||||||
height = FFALIGN(height / 8, 2) * 8;
|
height = FFALIGN(height / 8, 2) * 8;
|
||||||
s->plane[i].width = width;
|
s->plane[i].width = width;
|
||||||
|
Reference in New Issue
Block a user