aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDale Curtis <dalecurtis@chromium.org>2013-01-10 11:05:29 -0800
committerMichael Niedermayer <michaelni@gmx.at>2014-06-09 01:13:58 +0200
commit2facb10f705ab3f34b7a050107d7556b388c068c (patch)
treeb2ecd8b7d454353233b90e2d338c056d7f98a768
parent3b977a6ded41b893f4fa1587490c8c98577ac22b (diff)
downloadffmpeg-2facb10f705ab3f34b7a050107d7556b388c068c.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 45bafe5ec4..710883c28e 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++) {