[FFmpeg-cvslog] cavsdec: ensure the tables have been allocated before using them

Michael Niedermayer git at videolan.org
Fri Mar 30 19:39:28 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 30 19:18:42 2012 +0200| [ec0965be36b55624a03d20c3b24e6a7aa61d6cd2] | committer: Michael Niedermayer

cavsdec: ensure the tables have been allocated before using them

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ec0965be36b55624a03d20c3b24e6a7aa61d6cd2
---

 libavcodec/cavsdec.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c
index 8f87d5a..77b7abf 100644
--- a/libavcodec/cavsdec.c
+++ b/libavcodec/cavsdec.c
@@ -697,6 +697,8 @@ static int cavs_decode_frame(AVCodecContext * avctx,void *data, int *data_size,
             *data_size = 0;
             if(!h->got_keyframe)
                 break;
+            if(!h->top_qp)
+                break;
             init_get_bits(&s->gb, buf_ptr, input_size);
             h->stc = stc;
             if(decode_pic(h))



More information about the ffmpeg-cvslog mailing list