[FFmpeg-cvslog] avcodec/wmavoice: Check operations that can fail
Andreas Rheinhardt
git at videolan.org
Thu Apr 8 13:53:29 EEST 2021
ffmpeg | branch: release/4.4 | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Sat Apr 3 17:45:17 2021 +0200| [ed7efbe3ab94088fcad2785cf1d71195b4c506c6] | committer: Andreas Rheinhardt
avcodec/wmavoice: Check operations that can fail
There might be segfaults on failure.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
(cherry picked from commit e93875b756b575438d7b825332739719d4fbc600)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed7efbe3ab94088fcad2785cf1d71195b4c506c6
---
libavcodec/wmavoice.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c
index fbdb865360..f1e1504a88 100644
--- a/libavcodec/wmavoice.c
+++ b/libavcodec/wmavoice.c
@@ -367,7 +367,7 @@ static av_cold void wmavoice_flush(AVCodecContext *ctx)
static av_cold int wmavoice_decode_init(AVCodecContext *ctx)
{
static AVOnce init_static_once = AV_ONCE_INIT;
- int n, flags, pitch_range, lsp16_flag;
+ int n, flags, pitch_range, lsp16_flag, ret;
WMAVoiceContext *s = ctx->priv_data;
ff_thread_once(&init_static_once, wmavoice_init_static_data);
@@ -395,10 +395,11 @@ static av_cold int wmavoice_decode_init(AVCodecContext *ctx)
s->spillover_bitsize = 3 + av_ceil_log2(ctx->block_align);
s->do_apf = flags & 0x1;
if (s->do_apf) {
- ff_rdft_init(&s->rdft, 7, DFT_R2C);
- ff_rdft_init(&s->irdft, 7, IDFT_C2R);
- ff_dct_init(&s->dct, 6, DCT_I);
- ff_dct_init(&s->dst, 6, DST_I);
+ if ((ret = ff_rdft_init(&s->rdft, 7, DFT_R2C)) < 0 ||
+ (ret = ff_rdft_init(&s->irdft, 7, IDFT_C2R)) < 0 ||
+ (ret = ff_dct_init (&s->dct, 6, DCT_I)) < 0 ||
+ (ret = ff_dct_init (&s->dst, 6, DST_I)) < 0)
+ return ret;
ff_sine_window_init(s->cos, 256);
memcpy(&s->sin[255], s->cos, 256 * sizeof(s->cos[0]));
More information about the ffmpeg-cvslog
mailing list