diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-15 02:15:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-15 02:31:28 +0200 |
| commit | 3938a0eeae24a335b181d753c464cf5bab33ff01 (patch) | |
| tree | bfa8abe2f83656dbac32a0000b57c72b9b1d7c7b /libavcodec/audio_frame_queue.c | |
| parent | 4c73b3b1e07f0d91bcca33d7555ca570f2f3a394 (diff) | |
| download | ffmpeg-3938a0eeae24a335b181d753c464cf5bab33ff01.tar.gz | |
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 <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/audio_frame_queue.c')
| -rw-r--r-- | libavcodec/audio_frame_queue.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |