From patchwork Fri Oct 23 18:39:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 23181 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id E4103449BF4 for ; Fri, 23 Oct 2020 21:47:29 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C829768A2B6; Fri, 23 Oct 2020 21:47:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-3.mx.upcmail.net (vie01a-dmta-pe02-3.mx.upcmail.net [62.179.121.159]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ABD5F688109 for ; Fri, 23 Oct 2020 21:47:23 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1kW1zV-0006ft-0b for ffmpeg-devel@ffmpeg.org; Fri, 23 Oct 2020 20:40:41 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id W1yXkeLZJIr7GW1yXksCOk; Fri, 23 Oct 2020 20:39:41 +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.3 cv=QN4WuTDL c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=Dn499lM_F7AJTRht8_cA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=SsAZrZ5W_gNWK9tOzrEV:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 23 Oct 2020 20:39:38 +0200 Message-Id: <20201023183940.31485-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201023183940.31485-1-michael@niedermayer.cc> References: <20201023183940.31485-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfP699hPVs3O/np8gNBGQ0H2P50+vwmQyHRTBPQJspE1AxI3H2yo7BPM9n5Ww/hoT9TfQlgHA40l0ldMrkrYarl8X5irq8+DA4rSO4YXlXAxiMAmMtPSp qbyKI7Sd1c2vXLxxRum8BaN4KMTVnzSohH/JLksdzCTnIrsoblAC0P9Z Subject: [FFmpeg-devel] [PATCH 6/8] avformat/aaxdec: Check string before strcmp() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Fixes: NULL ptr dereference Fixes: 26508/clusterfuzz-testcase-minimized-ffmpeg_dem_AAX_fuzzer-5694725249826816 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/aaxdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/aaxdec.c b/libavformat/aaxdec.c index 3db6e9bc6d..7d10e805ca 100644 --- a/libavformat/aaxdec.c +++ b/libavformat/aaxdec.c @@ -232,7 +232,7 @@ static int aax_read_header(AVFormatContext *s) int64_t col_offset; int flag, type; - if (strcmp(a->xcolumns[c].name, "data")) + if (!a->xcolumns[c].name || strcmp(a->xcolumns[c].name, "data")) continue; type = a->xcolumns[c].type;