[FFmpeg-cvslog] rv34: Avoid NULL dereference on corrupted bitstream
Laurent Aimar
git at videolan.org
Thu Sep 22 01:17:29 CEST 2011
ffmpeg | branch: release/0.8 | Laurent Aimar <fenrir at videolan.org> | Sat Sep 17 23:43:58 2011 +0200| [11b72c073c7f59ee19067ddaa7ea7755b972d793] | committer: Anton Khirnov
rv34: Avoid NULL dereference on corrupted bitstream
rv34_decode_slice() can return without allocating any pictures.
Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit d0f6ab0298f2309c6104626787ed73416298b019)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11b72c073c7f59ee19067ddaa7ea7755b972d793
---
libavcodec/rv34.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index 910b933..2383903 100644
--- a/libavcodec/rv34.c
+++ b/libavcodec/rv34.c
@@ -1486,7 +1486,7 @@ int ff_rv34_decode_frame(AVCodecContext *avctx,
break;
}
- if(last){
+ if(last && s->current_picture_ptr){
if(r->loop_filter)
r->loop_filter(r, s->mb_height - 1);
ff_er_frame_end(s);
More information about the ffmpeg-cvslog
mailing list