[FFmpeg-devel] [PATCH] lavc: fix avpacket memleak with subtitles recoding.

[Clément Bœsch]

On Mon, Mar 18, 2013 at 02:19:21AM +0100, Clément Bœsch wrote:
> On Sun, Mar 17, 2013 at 02:30:16AM +0100, Clément Bœsch wrote:
> > ---
> >  libavcodec/utils.c | 10 ++++++++--
> >  1 file changed, 8 insertions(+), 2 deletions(-)
> > 
> > diff --git a/libavcodec/utils.c b/libavcodec/utils.c
> > index bed664e..1c9174c 100644
> > --- a/libavcodec/utils.c
> > +++ b/libavcodec/utils.c
> > @@ -2162,6 +2162,7 @@ static int recode_subtitle(AVCodecContext *avctx,
> >      ret = av_new_packet(&tmp, inl * UTF8_MAX_BYTES);
> >      if (ret < 0)
> >          goto end;
> > +    outpkt->buf  = tmp.buf;
> >      outpkt->data = tmp.data;
> >      outpkt->size = tmp.size;
> >      outb = outpkt->data;
> > @@ -2221,8 +2222,13 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub,
> >              ret = avctx->codec->decode(avctx, sub, got_sub_ptr, &pkt_recoded);
> >              av_assert1((ret >= 0) >= !!*got_sub_ptr &&
> >                         !!*got_sub_ptr >= !!sub->num_rects);
> > -            if (tmp.data != pkt_recoded.data)
> > -                av_free(pkt_recoded.data);
> > +            if (tmp.data != pkt_recoded.data) { // did we recode?
> > +                /* prevent from destroying side data from original packet */
> > +                pkt_recoded.side_data = NULL;
> > +                pkt_recoded.side_data_elems = 0;
> > +
> > +                av_free_packet(&pkt_recoded);
> > +            }
> >              sub->format = !(avctx->codec_descriptor->props & AV_CODEC_PROP_BITMAP_SUB);
> >              avctx->pkt = NULL;
> >          }
> 
> I'll apply this soon unless I see a comment.
> 

Applied.

-- 
Clément B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20130318/05ced42a/attachment.asc>