diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-29 18:27:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-29 19:16:49 +0200 |
| commit | a2e50fa068dc586d5ab50e02bcd049eb702ccf47 (patch) | |
| tree | 2894e7bc12980d37ca218993820e6d0d4b524b0f | |
| parent | 2fa89b27365b1e474d8d2047036c8a8f1377bfe0 (diff) | |
| parent | 225f78b7ef589e52bbbb19c97d36de5b27982702 (diff) | |
| download | ffmpeg-a2e50fa068dc586d5ab50e02bcd049eb702ccf47.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Avoid a null pointer dereference on clean-up after oom in ac3 encoder.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/ac3enc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index a0b810e0d7..37c496cd15 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -2017,6 +2017,7 @@ av_cold int ff_ac3_encode_close(AVCodecContext *avctx) AC3EncodeContext *s = avctx->priv_data; av_freep(&s->windowed_samples); + if (s->planar_samples) for (ch = 0; ch < s->channels; ch++) av_freep(&s->planar_samples[ch]); av_freep(&s->planar_samples); |