[FFmpeg-cvslog] Prevent double free of side_data when AVFMT_FLAG_KEEP_SIDE_DATA flag is set

[Gavin Kinsey]

ffmpeg | branch: master | Gavin Kinsey <gkinsey at ad-holdings.co.uk> | Thu Sep  8 13:01:14 2011 +0100| [d64066f6e88c827e33002b2c7740efd62cd5ba7f] | committer: Michael Niedermayer

Prevent double free of side_data when AVFMT_FLAG_KEEP_SIDE_DATA flag is set

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d64066f6e88c827e33002b2c7740efd62cd5ba7f
---

 libavformat/utils.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index d3a0d4a..706c2b4 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1146,7 +1146,10 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt)
             if (!st->need_parsing || !st->parser) {
                 /* no parsing needed: we just output the packet as is */
                 /* 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);
                 s->cur_st = NULL;
                 if ((s->iformat->flags & AVFMT_GENERIC_INDEX) &&