From patchwork Sat Aug 13 21:50:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 37266 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp528445pzi; Sat, 13 Aug 2022 14:51:13 -0700 (PDT) X-Google-Smtp-Source: AA6agR5/nIjulg5zHJ85AisB7cVHTPoTXOf6YcBqyNWzTWCX6ulUt6q0vJ3nfkqNUK15akV/MBRj X-Received: by 2002:a17:907:969f:b0:730:df57:123d with SMTP id hd31-20020a170907969f00b00730df57123dmr6527297ejc.430.1660427473289; Sat, 13 Aug 2022 14:51:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660427473; cv=none; d=google.com; s=arc-20160816; b=RIsfkxGe9G7bj2xkh5RfP3N/MIeBFuNG/xclA9JRhjFHg481JGEdZhiyJtaWJSEu5Z zHNx762AHCsc5feymVCkjTBtiZREyHXsqEx+Lt8xVme2VEXY5RItp3Zs+a9h/u1GACuV khj0XUYSPWREcajIwHqxUuuv9gKRFCJZIDYYE4Fqg22/Cc+LxyydHyzO1mAHCpN+ln6u ESo3iFTKnvyavyeZ/GDtACG9H91CkX5BB9TDtgdpE3csyA+XYuKXvSwey745MZ0MUnMG 6mJRl8pRWu0h2BNzAhCtVhe6UQcx+b1POb2oEIPrl7IRBQPcw8usznnPHX59AWZCd+he dbZw== 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=i0s0Ky656GxLW+Ph1f3/Y/ml14zN05+jNfx033stvo4=; b=ad5rtPt+TTfFh4wCX7c2NXaYIq3+gkk1YAfpzJ7dGs8dt7beZIPavWFF52wl2WS2jO 1Zgujr9ajVguVS28a4ozHzUkNkLUqzA5E7MogC7RQukIey0bVRJZ33DsffYQxlXe4cAR STrmm1J4Wsxjo7NnEpj7z8FX6snfh5rKDkOY3GieYPRYv9Xb4hX9KaehFr8WrDIT11ti n4CAZU+2Coa848SqFCuwg7IwStSoka3H3kkP45L4GKCAfOf+hVBnoasNRtnVA3bYYAyX G31/NCNvNdHNowjnxnrUsiPb7ZSaitYgpJ+VnWRJVmeeFNMAqvTuP6xZ2Tmt6p56V7NR rUjw== 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 d23-20020a50f697000000b0043cb489640bsi5170045edn.362.2022.08.13.14.51.12; Sat, 13 Aug 2022 14:51:13 -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 8896068B82B; Sun, 14 Aug 2022 00:50:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-2.mx.upcmail.net (unknown [62.179.121.146]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E2A168B82B for ; Sun, 14 Aug 2022 00:50:38 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oMz1h-00GgHq-MW for ffmpeg-devel@ffmpeg.org; Sat, 13 Aug 2022 23:50:37 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id Mz14oAfd08s8UMz1hoTSHH; Sat, 13 Aug 2022 23:50:37 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id Mz1hoPP6v8eSWMz1hoheer; Sat, 13 Aug 2022 23:50:37 +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=KKE5sHJo c=1 sm=1 tr=0 ts=62f81cad a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=JaXW8oNh8n8vpOQF9X8A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 13 Aug 2022 23:50:35 +0200 Message-Id: <20220813215035.12996-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220813215035.12996-1-michael@niedermayer.cc> References: <20220813215035.12996-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfCUCXkZkzbZ+YvyIktfCLTKhPyak9dFVaBPzbrG5oCaHMwwSrXweOT7PtoDg+2NRDXttafJ7J3mEQCxcg+IsNnoPXPtGsf8mtbDq+by1siKwRLSdHORU VmR2EzlrO8E6BDVQ50vGGcsBI0LB8NdI6NbB1JOWolcsZ1ckx+zP6GqJjyuVdJVUJ8Bu8oRWGGZsew== Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/4xm: treat AV_LOG_ERROR cases as errors 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: N7WBA0r6RO1t Fixes: Timeout Fixes: 49504/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FOURXM_fuzzer-570457772222054 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/4xm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 8941d715fa..a7c9043b0a 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -950,9 +950,11 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *picture, } else if (frame_4cc == AV_RL32("snd_")) { av_log(avctx, AV_LOG_ERROR, "ignoring snd_ chunk length:%d\n", buf_size); + return AVERROR_INVALIDDATA; } else { av_log(avctx, AV_LOG_ERROR, "ignoring unknown chunk length:%d\n", buf_size); + return AVERROR_INVALIDDATA; } picture->key_frame = picture->pict_type == AV_PICTURE_TYPE_I;