From 023bc5d92678997c5247eaf1882251a0e17b88da Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Thu, 15 Apr 2021 15:48:34 +0200 Subject: [PATCH] avcodec/nellymoserenc: Fix segfault when using unsupported channels/rate NellyMoserEncodeContext.avctx is only set in init after these checks, yet it is used by encode_end(). This is a regression since 0a56bfa71f751a2b25da8d060a019c1c75ca9d7b. Reviewed-by: Michael Niedermayer Signed-off-by: Andreas Rheinhardt (cherry picked from commit 652279e35becae7b4c0b6b73e4f6c074e8a8b77c) --- libavcodec/nellymoserenc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c index 99ede2f42b..8670431dcc 100644 --- a/libavcodec/nellymoserenc.c +++ b/libavcodec/nellymoserenc.c @@ -138,10 +138,8 @@ static av_cold int encode_end(AVCodecContext *avctx) ff_mdct_end(&s->mdct_ctx); - if (s->avctx->trellis) { - av_freep(&s->opt); - av_freep(&s->path); - } + av_freep(&s->opt); + av_freep(&s->path); ff_af_queue_close(&s->afq); av_freep(&s->fdsp);