generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rv34: Avoid NULL dereference on corrupted bitstream

Browse Source 
rv34_decode_slice() can return without allocating any pictures.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit d0f6ab0298)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Laurent Aimar
2011-09-17 23:43:58 +02:00
committed by Reinhard Tartler
parent 28d948ac44
commit f0bcba238a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/rv34.c
View File

@@ -1486,7 +1486,7 @@ int ff_rv34_decode_frame(AVCodecContext *avctx,
break; break;
} }
if(last){ if(last && s->current_picture_ptr){
if(r->loop_filter) if(r->loop_filter)
r->loop_filter(r, s->mb_height - 1); r->loop_filter(r, s->mb_height - 1);
ff_er_frame_end(s); ff_er_frame_end(s);