diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2013-03-17 02:30:10 +0100 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2013-03-18 22:04:29 +0100 |
| commit | 4b35be3251d9dd3b9c2b86ebf8ff482ac9f5b547 (patch) | |
| tree | bc7f58992434c455b5dce9f78f667cb33e7449fc | |
| parent | fdca977a22d3441cb807e71ddd4e5c335615e3fb (diff) | |
| download | ffmpeg-4b35be3251d9dd3b9c2b86ebf8ff482ac9f5b547.tar.gz | |
lavc: fix avpacket memleak with subtitles recoding.
| -rw-r--r-- | libavcodec/utils.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 94e8b579d4..b03113201f 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; } |