From 3938a0eeae24a335b181d753c464cf5bab33ff01 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 15 May 2012 02:15:23 +0200 Subject: [PATCH] audio_frame_queue: fix null ptr dereference This happened when a frame was removed before any was added. Fixes part of Ticket1208 Found-by: John Villamil, Piotr Bandurski and Carl Eugen Hoyos Signed-off-by: Michael Niedermayer --- libavcodec/audio_frame_queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/audio_frame_queue.c b/libavcodec/audio_frame_queue.c index 31cab29e18..999aa93c6b 100644 --- a/libavcodec/audio_frame_queue.c +++ b/libavcodec/audio_frame_queue.c @@ -100,7 +100,7 @@ void ff_af_queue_remove(AudioFrameQueue *afq, int nb_samples, int64_t *pts, if(nb_samples){ av_assert0(!afq->frame_count); - if(afq->frames[0].pts != AV_NOPTS_VALUE) + if(afq->frames && afq->frames[0].pts != AV_NOPTS_VALUE) afq->frames[0].pts += nb_samples; av_log(afq->avctx, AV_LOG_DEBUG, "Trying to remove %d more samples than are in the que\n", nb_samples); }