[FFmpeg-cvslog] asf: reset side data elements on packet copy.

Ronald S. Bultje git at videolan.org
Thu Mar 22 23:30:29 CET 2012


ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Wed Mar 21 16:10:37 2012 -0700| [e73c6aaabff1169899184c382385fe9afae5b068] | committer: Ronald S. Bultje

asf: reset side data elements on packet copy.

Prevents crash (double free) when free()ing the original packet.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable at libav.org

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

 libavformat/asfdec.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 0789960..d3869b4 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -1072,6 +1072,8 @@ static int ff_asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pk
             //printf("packet %d %d\n", asf_st->pkt.size, asf->packet_frag_size);
             asf_st->pkt.size = 0;
             asf_st->pkt.data = 0;
+            asf_st->pkt.side_data_elems = 0;
+            asf_st->pkt.side_data = NULL;
             break; // packet completed
         }
     }



More information about the ffmpeg-cvslog mailing list