virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/nellymoserenc: Fix segfault when using unsupported channels/rate

Browse Source 
NellyMoserEncodeContext.avctx is only set in init after these checks,
yet it is used by encode_end().
This is a regression since 0a56bfa71f.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
(cherry picked from commit 652279e35b)
This commit is contained in:
Andreas Rheinhardt 2021-04-15 15:48:34 +02:00
parent 7e9b9f24df
commit 023bc5d926
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/nellymoserenc.c
View File

@ -138,10 +138,8 @@ static av_cold int encode_end(AVCodecContext *avctx)
ff_mdct_end(&s->mdct_ctx); ff_mdct_end(&s->mdct_ctx);
if (s->avctx->trellis) { av_freep(&s->opt);
av_freep(&s->opt); av_freep(&s->path);
av_freep(&s->path);
}
ff_af_queue_close(&s->afq); ff_af_queue_close(&s->afq);
av_freep(&s->fdsp); av_freep(&s->fdsp);