[FFmpeg-cvslog] matroska: Fix use after free

Dale Curtis git at videolan.org
Mon Jun 9 01:58:48 CEST 2014


ffmpeg | branch: release/0.10 | Dale Curtis <dalecurtis at chromium.org> | Thu Jan 10 11:05:29 2013 -0800| [2facb10f705ab3f34b7a050107d7556b388c068c] | committer: Michael Niedermayer

matroska: Fix use after free

Signed-off-by: Dale Curtis <dalecurtis at chromium.org>
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
(cherry picked from commit ae3d41636942cbc0236bad21ad06c65f4eb0f096)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/matroskadec.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 45bafe5..710883c 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1720,6 +1720,7 @@ static int matroska_deliver_packet(MatroskaDemuxContext *matroska,
  */
 static void matroska_clear_queue(MatroskaDemuxContext *matroska)
 {
+    matroska->prev_pkt = NULL;
     if (matroska->packets) {
         int n;
         for (n = 0; n < matroska->num_packets; n++) {



More information about the ffmpeg-cvslog mailing list