[FFmpeg-devel] [PATCH 1/4] avcodec/mpegvideo_dec: Check for existence of planes before accesses
Andreas Rheinhardt
andreas.rheinhardt at outlook.com
Tue Oct 3 02:39:01 EEST 2023
Andreas Rheinhardt:
> Fixes segfaults with -debug +nomc -flags +gray (presuming
> a build with --enable-gray).
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> ---
> libavcodec/mpegvideo_dec.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c
> index 7aa46a4e25..77d90104f6 100644
> --- a/libavcodec/mpegvideo_dec.c
> +++ b/libavcodec/mpegvideo_dec.c
> @@ -249,10 +249,12 @@ static void gray_frame(AVFrame *frame)
> {
> int h_chroma_shift, v_chroma_shift;
>
> - av_pix_fmt_get_chroma_sub_sample(frame->format, &h_chroma_shift, &v_chroma_shift);
> -
> for (int i = 0; i < frame->height; i++)
> memset(frame->data[0] + frame->linesize[0] * i, 0x80, frame->width);
> +
> + if (!frame->data[1])
> + return;
> + av_pix_fmt_get_chroma_sub_sample(frame->format, &h_chroma_shift, &v_chroma_shift);
> for (int i = 0; i < AV_CEIL_RSHIFT(frame->height, v_chroma_shift); i++) {
> memset(frame->data[1] + frame->linesize[1] * i,
> 0x80, AV_CEIL_RSHIFT(frame->width, h_chroma_shift));
Will apply patches one, two and four of this patchset tonight unless
there are objections.
- Andreas
More information about the ffmpeg-devel
mailing list