[FFmpeg-cvslog] avcodec/vc1dec: fix null pointer dereference
Michael Niedermayer
git at videolan.org
Mon Aug 25 02:29:46 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 25 02:17:32 2014 +0200| [30f680ee0a2707af9a649a0aa3fd951d18a25c05] | committer: Michael Niedermayer
avcodec/vc1dec: fix null pointer dereference
Fixes Ticket3860
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=30f680ee0a2707af9a649a0aa3fd951d18a25c05
---
libavcodec/vc1dec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index bcfa4df..a25c3d9 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;
}
More information about the ffmpeg-cvslog
mailing list