]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/hevc: do not dereference pointer before null check in verify_md5()
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Oct 2013 22:35:18 +0000 (00:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Oct 2013 22:35:18 +0000 (00:35 +0200)
Fixes: CID1108607
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hevc.c

index 393556e81b8086192d9690e7defeaf103f52f544..eb44862a2c3f917e36b8b7b63f8693c9175514af 100644 (file)
@@ -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);