diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-06-30 23:25:18 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-06-30 23:25:18 +0200 |
| commit | f4aa8085f23c3abff3114d7bf638698d42110526 (patch) | |
| tree | 8a6643426580c5a8b2d4f1b093b0ab459cbffc25 /libavcodec/psymodel.c | |
| parent | 84343dd9d3b8e19c95c0f641a9f97915efec0633 (diff) | |
| download | ffmpeg-f4aa8085f23c3abff3114d7bf638698d42110526.tar.gz | |
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.c | 2 |
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); |