[FFmpeg-devel] [PATCH 1/2] avcodec/mjpegdec: Only allow 0x11110000 pix_fmt_id for bayer mode

Paul B Mahol onemda at gmail.com
Fri Sep 13 13:08:42 EEST 2019


ok

On 9/12/19, Michael Niedermayer <michael at niedermayer.cc> wrote:
> Fixes: NULL pointer dereference
> Fixes: assertion failure
> Fixes:
> 17003/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MJPEG_fuzzer-5696929253556224
> Fixes:
> 17039/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MJPEG_fuzzer-5651008134316032
>
> Found-by: continuous fuzzing process
> https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> ---
>  libavcodec/mjpegdec.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
> index 1f2fabe2df..5a80b7d289 100644
> --- a/libavcodec/mjpegdec.c
> +++ b/libavcodec/mjpegdec.c
> @@ -501,6 +501,8 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
>
>          switch (pix_fmt_id) {
>          case 0x11110000: /* for bayer-encoded huffman lossless JPEGs
> embedded in DNGs */
> +            if (!s->bayer)
> +                goto unk_pixfmt;
>              s->avctx->pix_fmt = AV_PIX_FMT_GRAY16LE;
>              break;
>          case 0x11111100:
> --
> 2.23.0
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".


More information about the ffmpeg-devel mailing list