diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-30 20:58:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-30 22:23:49 +0100 |
| commit | 7205e896a1ceb0e5c0256ed9cc1f69cf1fe664d4 (patch) | |
| tree | f8670181bdc9b11c3535997289459651b8b6c6c2 /libavcodec/dxa.c | |
| parent | daede25f0b3338340aac3e87c30d288ee00af9b8 (diff) | |
| download | ffmpeg-7205e896a1ceb0e5c0256ed9cc1f69cf1fe664d4.tar.gz | |
dxa: check reference frame availability before use.
Fix NULL pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dxa.c')
| -rw-r--r-- | libavcodec/dxa.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c index d43e1134e2..cf8ce0c46f 100644 --- a/libavcodec/dxa.c +++ b/libavcodec/dxa.c @@ -270,6 +270,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac case 13: c->pic.key_frame = 0; c->pic.pict_type = AV_PICTURE_TYPE_P; + if (!c->prev.data[0]) { + av_log(avctx, AV_LOG_ERROR, "Missing reference frame\n"); + return AVERROR_INVALIDDATA; + } decode_13(avctx, c, c->pic.data[0], srcptr, c->prev.data[0]); break; default: |