From 8dbffda0f9401644467111c85090fa0e8091e08a Mon Sep 17 00:00:00 2001 From: Ganesh Ajjanagadde Date: Wed, 2 Mar 2016 20:14:08 -0500 Subject: [PATCH] lavc/psymodel: check for av_malloc failure No idea why in commit 01ecb7172b684f1c4b3e748f95c5a9a494ca36ec the checks were removed; this can lead to NULL pointer dereferences. This effectively reverts that portion of the commit. Reviewed-by: Benoit Fouet Reviewed-by: Rostislav Pehlivanov Signed-off-by: Ganesh Ajjanagadde --- libavcodec/psymodel.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/psymodel.c b/libavcodec/psymodel.c index 6274a49ea9..2b5f111fbe 100644 --- a/libavcodec/psymodel.c +++ b/libavcodec/psymodel.c @@ -120,7 +120,12 @@ av_cold struct FFPsyPreprocessContext* ff_psy_preprocess_init(AVCodecContext *av FF_FILTER_MODE_LOWPASS, FILT_ORDER, cutoff_coeff, 0.0, 0.0); if (ctx->fcoeffs) { - ctx->fstate = av_mallocz(sizeof(ctx->fstate[0]) * avctx->channels); + ctx->fstate = av_mallocz_array(sizeof(ctx->fstate[0]), avctx->channels); + if (!ctx->fstate) { + av_free(ctx->fcoeffs); + av_free(ctx); + return NULL; + } for (i = 0; i < avctx->channels; i++) ctx->fstate[i] = ff_iir_filter_init_state(FILT_ORDER); }