diff options
author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-12-09 02:00:18 +0300 |
---|---|---|
committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-12-10 15:36:12 +0300 |
commit | 7d3baebe408cb7377dbb6fa1a7fd285e8e366440 (patch) | |
tree | ddd2315d4417b33a6a3dd46316521f18267f98c2 /libavcodec | |
parent | df694a5e9d40bdae734c8bb9523c13722b38ebe5 (diff) |
opus_parser: fix leaking channel_maps on error
Make ff_opus_parse_extradata free allocated memory on error instead of
expecting callers to free it in that case.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/opus.c | 1 | ||||
-rw-r--r-- | libavcodec/opusdec.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/opus.c b/libavcodec/opus.c index 08d94b6cba..1eeb92c5bd 100644 --- a/libavcodec/opus.c +++ b/libavcodec/opus.c @@ -403,6 +403,7 @@ av_cold int ff_opus_parse_extradata(AVCodecContext *avctx, } else if (idx >= streams + stereo_streams) { av_log(avctx, AV_LOG_ERROR, "Invalid channel map for output channel %d: %d\n", i, idx); + av_freep(&s->channel_maps); return AVERROR_INVALIDDATA; } diff --git a/libavcodec/opusdec.c b/libavcodec/opusdec.c index ec793c6c47..329f784182 100644 --- a/libavcodec/opusdec.c +++ b/libavcodec/opusdec.c @@ -646,7 +646,6 @@ static av_cold int opus_decode_init(AVCodecContext *avctx) /* find out the channel configuration */ ret = ff_opus_parse_extradata(avctx, c); if (ret < 0) { - av_freep(&c->channel_maps); av_freep(&c->fdsp); return ret; } |