Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2013-07-01 01:25:18 +0400
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-07-01 01:25:18 +0400
commitf4aa8085f23c3abff3114d7bf638698d42110526 (patch)
tree8a6643426580c5a8b2d4f1b093b0ab459cbffc25 /libavcodec/psymodel.c
parent84343dd9d3b8e19c95c0f641a9f97915efec0633 (diff)
Avoid a null pointer dereference on oom in the aac encoder.
Fixes ticket #2732.
Diffstat (limited to 'libavcodec/psymodel.c')
-rw-r--r--libavcodec/psymodel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/psymodel.c b/libavcodec/psymodel.c
index ea11636ce2..bfc85b3bc5 100644
--- a/libavcodec/psymodel.c
+++ b/libavcodec/psymodel.c
@@ -75,7 +75,7 @@ FFPsyChannelGroup *ff_psy_find_group(FFPsyContext *ctx, int channel)
av_cold void ff_psy_end(FFPsyContext *ctx)
{
- if (ctx->model->end)
+ if (ctx->model && ctx->model->end)
ctx->model->end(ctx);
av_freep(&ctx->bands);
av_freep(&ctx->num_bands);