aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-11 02:16:43 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-11 02:16:43 +0200
commit6801eb0a0981f113f5f09ed4799d9ae805af62a3 (patch)
treeb9c73b7ed77e63a560c2d3c551b1e77d2191e496
parentf4e814f787d050ac65f507b1304dcdc4ffa56f29 (diff)
downloadffmpeg-6801eb0a0981f113f5f09ed4799d9ae805af62a3.tar.gz
avcodec/vc1dec: do not crash when flushing without an allocated frame
Fixes Ticket3837 Found-by: Piotr Bandurski <ami_stuff@o2.pl> 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 06deb7fad6..a73d6150b4 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -5514,7 +5514,7 @@ static void vc1_sprite_flush(AVCodecContext *avctx)
Since we can't enforce it, clear to black the missing sprite. This is
wrong but it looks better than doing nothing. */
- if (f->data[0])
+ if (f && f->data[0])
for (plane = 0; plane < (s->flags&CODEC_FLAG_GRAY ? 1 : 3); plane++)
for (i = 0; i < v->sprite_height>>!!plane; i++)
memset(f->data[plane] + i * f->linesize[plane],