Commit d64066f6 authored by Gavin Kinsey's avatar Gavin Kinsey Committed by Michael Niedermayer

Prevent double free of side_data when AVFMT_FLAG_KEEP_SIDE_DATA flag is set

parent 5241bc27
...@@ -1146,7 +1146,10 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt) ...@@ -1146,7 +1146,10 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt)
if (!st->need_parsing || !st->parser) { if (!st->need_parsing || !st->parser) {
/* no parsing needed: we just output the packet as is */ /* no parsing needed: we just output the packet as is */
/* raw data support */ /* raw data support */
*pkt = st->cur_pkt; st->cur_pkt.data= NULL; *pkt = st->cur_pkt;
st->cur_pkt.data= NULL;
st->cur_pkt.side_data_elems = 0;
st->cur_pkt.side_data = NULL;
compute_pkt_fields(s, st, NULL, pkt); compute_pkt_fields(s, st, NULL, pkt);
s->cur_st = NULL; s->cur_st = NULL;
if ((s->iformat->flags & AVFMT_GENERIC_INDEX) && if ((s->iformat->flags & AVFMT_GENERIC_INDEX) &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment