aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-25 02:17:32 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-03 03:16:38 +0200
commit17a6ca7d3179f63f145bd08886c7252a77a1eeff (patch)
tree06d48f23bf1f07744bf833e4771c6c7b0864cffe
parent8a20224059647afaeed77f354932f8e089d354f6 (diff)
downloadffmpeg-17a6ca7d3179f63f145bd08886c7252a77a1eeff.tar.gz
avcodec/vc1dec: fix null pointer dereference
Fixes Ticket3860 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 30f680ee0a2707af9a649a0aa3fd951d18a25c05) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/vc1dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index a73d6150b4..2d4fdd3ab8 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -5484,7 +5484,7 @@ static int vc1_decode_sprites(VC1Context *v, GetBitContext* gb)
if (ret < 0)
return ret;
- if (!s->current_picture.f->data[0]) {
+ if (!s->current_picture.f || !s->current_picture.f->data[0]) {
av_log(avctx, AV_LOG_ERROR, "Got no sprites\n");
return -1;
}