asf: reset side data elements on packet copy.

Message ID 20120322192027.D25765E0B1@aruru.libav.org
State New
Headers show

Commit Message

Janne Grunau March 22, 2012, 7:20 p.m.
Module: libav
Branch: master
Commit: e73c6aaabff1169899184c382385fe9afae5b068

Author:    Ronald S. Bultje <rsbultje@gmail.com>
Committer: Ronald S. Bultje <rsbultje@gmail.com>
Date:      Wed Mar 21 16:10:37 2012 -0700

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@libav.org

---

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

Patch

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
         }
     }