From 0b27136c65c1b4fab29b5b354e1f470f974bc310 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 14 Apr 2012 19:33:24 +0200 Subject: [PATCH] matroskadec: fix null pointer dereference Fixes: Ticket1206 Found-by: John Villamil Signed-off-by: Michael Niedermayer --- libavformat/matroskadec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 2205af6894..e9c31013cd 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1581,9 +1581,11 @@ static int matroska_read_header(AVFormatContext *s) } else if (codec_id == CODEC_ID_RA_144) { track->audio.out_samplerate = 8000; track->audio.channels = 1; - } else if (codec_id == CODEC_ID_RA_288 || codec_id == CODEC_ID_COOK || - codec_id == CODEC_ID_ATRAC3 || codec_id == CODEC_ID_SIPR) { + } else if ((codec_id == CODEC_ID_RA_288 || codec_id == CODEC_ID_COOK || + codec_id == CODEC_ID_ATRAC3 || codec_id == CODEC_ID_SIPR) + && track->codec_priv.data) { int flavor; + ffio_init_context(&b, track->codec_priv.data,track->codec_priv.size, 0, NULL, NULL, NULL, NULL); avio_skip(&b, 22);