From patchwork Mon Aug 15 17:59:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 37293 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp1416319pzi; Mon, 15 Aug 2022 11:00:46 -0700 (PDT) X-Google-Smtp-Source: AA6agR6DXMsJT2Yltx+BQIwAbHSkaIHVO8AFroxeqJ0/J8dA4YUzkvLgO/aWTBdmZ9rIOi2S87HP X-Received: by 2002:a05:6402:2691:b0:43d:ba10:854b with SMTP id w17-20020a056402269100b0043dba10854bmr15316841edd.158.1660586446336; Mon, 15 Aug 2022 11:00:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660586446; cv=none; d=google.com; s=arc-20160816; b=q8eop7yqHS5LSDMxILuwPcM1Zjz3YCskMLCmZa5WB8OGNynSXROjLfPiVrUHpdauap e7PyRK9AXtOTdPbj2G2z+zd30pGqmMPqtds0kBK/+M1JWIc3js8Sv+1O2eHw63uKKh0U 7u5IqPaxUieDanvTbl/9lDmacYVl1m/KzQApDnMw99j0Gwh2qm+uVXyKqdtDPeEVjIn4 doLO/Im928t2jU7wbUBfM5J0IyNmyqhzhzdAfsFSOGZM9DHMiFi0zayOahkU5VQ64H/Y hWMKa2omQgOk3O/3aS9owsD2VwbcE1dWjeZUsffx5flBvqtnQ++ygbWoRfkwdUgm5Yd5 F+zA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=ElL1ZM+Vxg+oTaKdwLQd4bnB31SpbQFJwOuwHOA2Y2I=; b=R5/MSbVFhthvFAzRt+8QuuDo0pUcmw1mSrwr2zj86nrwOujmLgXn2dfaFEFWJF7gVt FQI9snodY3oa6NFVZDXmF3/2Nj78yUhJFyxz70K73MDCmdAphO9/c1lWRTWYYRJt0P1Z 4xkH2gpSBmfcrIJSQcQTkHe1ghvdO0o5LJZ0EAO+wexZWI/QFv0jybpOn7zeN+Q/nIWD 5q+fr+hd5KAMO+2yVXR1/Nh2Z6Lh2vao87efBqtMc1q/NvCvOyKaA+vmfqSdulMLshE8 uqv+QLEHEnCDPhcEvuQ/+fG3R1r3Y65ZtdyGUF6qWVp7duPi9s9LEnW+3ARBTg20XOwh aR8w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m21-20020a056402051500b0044276b7adbesi7449295edv.591.2022.08.15.11.00.45; Mon, 15 Aug 2022 11:00:46 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 46DDF68B96C; Mon, 15 Aug 2022 21:00:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D1CCB68B72B for ; Mon, 15 Aug 2022 21:00:28 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oNeO4-00CWtr-1U for ffmpeg-devel@ffmpeg.org; Mon, 15 Aug 2022 20:00:28 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id NeO3ooH928s8UNeO4oXvso; Mon, 15 Aug 2022 20:00:28 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id NeN6od1tuOPqFNeN6oLhb2; Mon, 15 Aug 2022 19:59:28 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=62fa8980 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=PjUK7NhsGhYFtEnob34A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 15 Aug 2022 19:59:25 +0200 Message-Id: <20220815175927.8743-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220815175927.8743-1-michael@niedermayer.cc> References: <20220815175927.8743-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfGu65WP3J4gBBLP56OVgCfqhOscZ+RJ9+GJK4MREwB0R3cSGOmo01JxeoNq1VU4LNz5cpQN0xXbbNTnlq4lqMeySckLyuCZX76xTNyuj8yyABKd4tSTl G9nNtbJ7CVg07Slc2p4SOe/8oHLJ/0RJEMc1YbUep+C9ocEOcmQDq3s4kw9LyeAffpH2ZfrKyyVCvA== Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/hevcdec: Check s->ref in the md5 path similar to hwaccel X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: zxUUBPHTUEb7 This is somewhat redundant with the is_decoded check. Maybe there is a nicer solution Fixes: Null pointer dereference Fixes: 49584/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-5297367351427072 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hevcdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index f1be8af2cd..477d6d9d36 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -3498,7 +3498,7 @@ static int hevc_decode_frame(AVCodecContext *avctx, AVFrame *rframe, } } else { /* verify the SEI checksum */ - if (avctx->err_recognition & AV_EF_CRCCHECK && s->is_decoded && + if (avctx->err_recognition & AV_EF_CRCCHECK && s->ref && s->is_decoded && s->sei.picture_hash.is_md5) { ret = verify_md5(s, s->ref->frame); if (ret < 0 && avctx->err_recognition & AV_EF_EXPLODE) {