eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 18:40:03 +01:00
Code Issues Packages Projects Releases Wiki 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>
This commit is contained in:
Andreas Rheinhardt
2021-04-15 15:48:34 +02:00
parent 918273aa3e
commit 652279e35b
1 changed files with 2 additions and 4 deletions
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);