From f2eca8d06060b9ec265c21ae38b6dd3088c52cc6 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 20 Oct 2013 00:35:18 +0200 Subject: avcodec/hevc: do not dereference pointer before null check in verify_md5() Fixes: CID1108607 Signed-off-by: Michael Niedermayer --- libavcodec/hevc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libavcodec/hevc.c') diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 393556e81b..eb44862a2c 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); -- cgit v1.2.3