aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDale Curtis <dalecurtis@chromium.org>2013-01-10 11:05:29 -0800
committerMichael Niedermayer <michaelni@gmx.at>2015-03-12 00:43:38 +0100
commitc3ece52decafc4923aebe7fd74b274e9ebb1962e (patch)
tree475fd3fdc3138bbb7bff7892016ee9b1d9de98e3
parent0701f7c5c3f9e8a336d1f5773a89a5e63f8f5497 (diff)
downloadffmpeg-c3ece52decafc4923aebe7fd74b274e9ebb1962e.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 2fe1db5301..ac91f67ad5 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1676,6 +1676,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++) {