[FFmpeg-devel] [PATCH 1/2] opus_parser: fix leaking channel_maps on error

[Andreas Cadhalpun]

On 09.12.2016 15:23, Michael Niedermayer wrote:
> On Fri, Dec 09, 2016 at 12:08:10AM +0100, Andreas Cadhalpun wrote:
>> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
>> ---
>>  libavcodec/opus_parser.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/libavcodec/opus_parser.c b/libavcodec/opus_parser.c
>> index c30fd7b..21a73ee 100644
>> --- a/libavcodec/opus_parser.c
>> +++ b/libavcodec/opus_parser.c
>> @@ -116,11 +116,11 @@ static int opus_find_frame_end(AVCodecParserContext *ctx, AVCodecContext *avctx,
>>  
>>      if (avctx->extradata && !s->extradata_parsed) {
>>          ret = ff_opus_parse_extradata(avctx, &s->ctx);
>> +        av_freep(&s->ctx.channel_maps);
>>          if (ret < 0) {
>>              av_log(avctx, AV_LOG_ERROR, "Error parsing Ogg extradata.\n");
>>              return AVERROR_INVALIDDATA;
>>          }
>> -        av_freep(&s->ctx.channel_maps);
>>          s->extradata_parsed = 1;
>>      }
> 
> isnt it more correct for ff_opus_parse_extradata() to cleanup what
> it allocated on error ?

Probably, but opusdec already did it the other way around.
I'm fine with changing that, though. See attached patch.

Best regards,
Andreas

-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-opus_parser-fix-leaking-channel_maps-on-error.patch
Type: text/x-diff
Size: 1446 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20161209/29760a87/attachment.patch>