[FFmpeg-devel] [PATCH 3/4] avcodec/utils: Check close before calling it

[Paul B Mahol]

LGTM

On 7/21/19, Michael Niedermayer <michael at niedermayer.cc> wrote:
> Fixes: NULL pointer dereference
> Fixes:
> 15733/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_IDF_fuzzer-5658616977162240
>
> 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/utils.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavcodec/utils.c b/libavcodec/utils.c
> index 9ff9628f7f..66c68d1cf5 100644
> --- a/libavcodec/utils.c
> +++ b/libavcodec/utils.c
> @@ -1024,7 +1024,7 @@ end:
>
>      return ret;
>  free_and_end:
> -    if (avctx->codec &&
> +    if (avctx->codec && avctx->codec->close &&
>          (codec_init_ok ||
>           (avctx->codec->caps_internal & FF_CODEC_CAP_INIT_CLEANUP)))
>          avctx->codec->close(avctx);
> --
> 2.22.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".