[FFmpeg-cvslog] xan: Prevent NULL dereferences with missing reference frame
Laurent Aimar
git at videolan.org
Mon Mar 19 05:30:27 CET 2012
ffmpeg | branch: release/0.8 | Laurent Aimar <fenrir at videolan.org> | Tue Sep 27 22:15:32 2011 +0000| [fb20141563d740a979f3e4db6db0e3908c5c6962] | committer: Reinhard Tartler
xan: Prevent NULL dereferences with missing reference frame
Signed-off-by: Janne Grunau <janne-libav at jannau.net>
(cherry picked from commit 06be075cda0a6ba8bab8f543571b380884f562ac)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fb20141563d740a979f3e4db6db0e3908c5c6962
---
libavcodec/xan.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/libavcodec/xan.c b/libavcodec/xan.c
index 0f16e88..6c779c4 100644
--- a/libavcodec/xan.c
+++ b/libavcodec/xan.c
@@ -224,6 +224,8 @@ static inline void xan_wc3_copy_pixel_run(XanContext *s,
palette_plane = s->current_frame.data[0];
prev_palette_plane = s->last_frame.data[0];
+ if (!prev_palette_plane)
+ prev_palette_plane = palette_plane;
stride = s->current_frame.linesize[0];
line_inc = stride - width;
curframe_index = y * stride + x;
More information about the ffmpeg-cvslog
mailing list