diff options
| author | Laurent Aimar <fenrir@videolan.org> | 2011-09-17 23:43:58 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2011-09-19 15:44:22 +0300 |
| commit | d0f6ab0298f2309c6104626787ed73416298b019 (patch) | |
| tree | f33db3e2ed9720f6b8d1351f248c934b9f17a9e7 /libavcodec/rv34.c | |
| parent | 4a29b471869353c3077fb4b25b6518eb1047afb7 (diff) | |
| download | ffmpeg-d0f6ab0298f2309c6104626787ed73416298b019.tar.gz | |
rv34: Avoid NULL dereference on corrupted bitstream
rv34_decode_slice() can return without allocating any pictures.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/rv34.c')
| -rw-r--r-- | libavcodec/rv34.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 90ff51d8f2..aa52a93dbb 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1533,7 +1533,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); |