summaryrefslogtreecommitdiff
path: root/libavcodec/rv34.c
diff options
context:
space:
mode:
authorLaurent Aimar <fenrir@videolan.org>2011-09-17 23:43:58 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-18 00:57:49 +0200
commit140dbcff357351570426efd0e0bc00e380f5436e (patch)
tree8feceb3bc8cdc6a4d341ddfeaa91e9b4e37be2bd /libavcodec/rv34.c
parentd788af6cf696d547a442c47e1ce6f93bc9fc97b6 (diff)
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>
Diffstat (limited to 'libavcodec/rv34.c')
-rw-r--r--libavcodec/rv34.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index ca727a5500..963bd1e3da 100644
--- a/libavcodec/rv34.c
+++ b/libavcodec/rv34.c
@@ -1538,7 +1538,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);