eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-16 03:50:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

lavc: fix avpacket memleak with subtitles recoding.

Browse Source
This commit is contained in:
Clément Bœsch
2013-03-17 02:30:10 +01:00
parent fdca977a22
commit 4b35be3251
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/utils.c
View File

@@ -2162,6 +2162,7 @@ static int recode_subtitle(AVCodecContext *avctx,
ret = av_new_packet(&tmp, inl * UTF8_MAX_BYTES); ret = av_new_packet(&tmp, inl * UTF8_MAX_BYTES);
if (ret < 0) if (ret < 0)
goto end; goto end;
outpkt->buf = tmp.buf;
outpkt->data = tmp.data; outpkt->data = tmp.data;
outpkt->size = tmp.size; outpkt->size = tmp.size;
outb = outpkt->data; 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); ret = avctx->codec->decode(avctx, sub, got_sub_ptr, &pkt_recoded);
av_assert1((ret >= 0) >= !!*got_sub_ptr && av_assert1((ret >= 0) >= !!*got_sub_ptr &&
!!*got_sub_ptr >= !!sub->num_rects); !!*got_sub_ptr >= !!sub->num_rects);
if (tmp.data != pkt_recoded.data) if (tmp.data != pkt_recoded.data) { // did we recode?
av_free(pkt_recoded.data); /* 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); sub->format = !(avctx->codec_descriptor->props & AV_CODEC_PROP_BITMAP_SUB);
avctx->pkt = NULL; avctx->pkt = NULL;
} }