diff options
| author | Laurent Aimar <fenrir@videolan.org> | 2011-09-17 23:43:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-21 20:56:53 +0200 |
| commit | 60a1384013071e4549e48459d484a7b72aeb6ebc (patch) | |
| tree | 86ccd1b3d131ae386985ad219634814c9c9d2f8c /libavcodec | |
| parent | b59919afe2b6caad1ddcbbb71bdcf5a8750b8c71 (diff) | |
| download | ffmpeg-60a1384013071e4549e48459d484a7b72aeb6ebc.tar.gz | |
Avoid NULL dereference on corrupted bitstream with real decoder.
rv34_decode_slice() can return without allocating any pictures.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 140dbcff357351570426efd0e0bc00e380f5436e)
Diffstat (limited to 'libavcodec')
| -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 0e5f868390..9196c9558d 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1498,7 +1498,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); |