[FFmpeg-cvslog] avcodec/hevc: do not dereference pointer before null check in verify_md5()

Michael Niedermayer git at videolan.org
Sun Oct 20 01:15:11 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct 20 00:35:18 2013 +0200| [f2eca8d06060b9ec265c21ae38b6dd3088c52cc6] | committer: Michael Niedermayer

avcodec/hevc: do not dereference pointer before null check in verify_md5()

Fixes: CID1108607

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/hevc.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 393556e..eb44862 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -2196,12 +2196,14 @@ static void print_md5(void *log_ctx, int level,  uint8_t md5[16])
 static int verify_md5(HEVCContext *s, AVFrame *frame)
 {
     const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format);
-    int pixel_shift = desc->comp[0].depth_minus1 > 7;
+    int pixel_shift;
     int i, j;
 
     if (!desc)
         return AVERROR(EINVAL);
 
+    pixel_shift = desc->comp[0].depth_minus1 > 7;
+
     av_log(s->avctx, AV_LOG_DEBUG, "Verifying checksum for frame with POC %d: ",
            s->poc);
 



More information about the ffmpeg-cvslog mailing list