aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDale Curtis <dalecurtis@chromium.org>2013-01-10 11:05:29 -0800
committerMichael Niedermayer <michaelni@gmx.at>2014-03-13 00:39:12 +0100
commit90c8fa52216b7a9fc83167f791dd7bb1d01bbaf2 (patch)
tree505cfe98375f57cca5d26139f75a61303e8dd5de
parent43aae004557294ffe3487bb4b194c3eb72beb27b (diff)
downloadffmpeg-90c8fa52216b7a9fc83167f791dd7bb1d01bbaf2.tar.gz
matroska: Fix use after free
Signed-off-by: Dale Curtis <dalecurtis@chromium.org> Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit ae3d41636942cbc0236bad21ad06c65f4eb0f096) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/matroskadec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 21f1b5d3e0..6cf9028135 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1503,6 +1503,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++) {