From patchwork Tue Sep 14 20:58:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30249 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp5347541iov; Tue, 14 Sep 2021 13:59:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxxwpF5fpY8it7ztOV/4vt2xZT6soIMimi2YzWpIEqEAWKg42ZAuIdlOW1HlmNNlVaAc8yX X-Received: by 2002:a50:fe96:: with SMTP id d22mr19115885edt.198.1631653182392; Tue, 14 Sep 2021 13:59:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631653182; cv=none; d=google.com; s=arc-20160816; b=lS95+eSeR2Og9BO0zBtgK/Q7pn5RKSwwrcpbOkL9u58aLx644RxAeV7m/sa9/SyJVu b/0PgbwIk5xgLIRWBeQgjROyQKxTKRrNpcKfsk6/S7mcgoDthyRu0k99FjC3HfRUm+kr FnjlNdDIFkIXz99iPkLb2KhPkv5z8t2r5Q/KPaaU1r7KHRSBneZ1jsm0rUtwu/nT+PWp Q167TAz8ogORtkRPr7+fJwgRAdm1NCRFs7VsVVvFJTnKeFYlxJCGhobUvnR3xhmJFEe4 kFTlrIrnMbcCCP6F/njh72hGhH2jl0aj4VMXq5PrWlOA4WMJws1KxC1SknjBDSaFyKFr CnNQ== 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:message-id:date:to:from:delivered-to; bh=4GCTAHzkEfa2E5ij2z1TOPecsqmKxRFbAscYgRMslnE=; b=f7S4AYB4KWJqhJxsECwUguzKcbSgq77abFWbKYTi6vDPaDwQGxFHo8MpcvxbQ918v7 s+cIco0wGFO8JOAl2jeuAmjF+Cwd8rEtbbm/thqAEP/Ic2BDwuS1SKyOvhC3DdwmZNUt juVfMU5mFXpbBrGqKSfw5WDElSoV2qrkOKgdxlOkMAo4hDt+UU2KnrC29d4EGMwM3qyZ Km699yiO7RzbD1ZzKfnVCepeo4/E1g5zfTd2gO39dsBRd9+aEGfTa//z7uiU/ozp+4cY ZbZJAaheFeN5hf4ZoR2WzWK5/5uPz5ijvXf2C/4pw9GCZc8OK/bFBH44mjvBCfYObQiz 8wlw== 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 16si11926992eji.352.2021.09.14.13.59.41; Tue, 14 Sep 2021 13:59:42 -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 2CDE868AF41; Tue, 14 Sep 2021 23:59:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-3.mx.upcmail.net (vie01a-dmta-pe03-3.mx.upcmail.net [62.179.121.162]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7143268AED3 for ; Tue, 14 Sep 2021 23:59:21 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mQFWT-00H0Fc-0P for ffmpeg-devel@ffmpeg.org; Tue, 14 Sep 2021 22:59:21 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id QFVUmFUMoljeHQFVUmuUIS; Tue, 14 Sep 2021 22:58:21 +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=BoHjPrf5 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=prtCZvIEUaJM9bh6gb8A:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 14 Sep 2021 22:58:18 +0200 Message-Id: <20210914205820.12598-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfMhEyINBE/HfLQRuAqFdi7ZFmbHIPu76MYdXnggawPxTZq6rCLzzsEkvEZZIWopR0f4+Jdk31zLxAbhVwY4kBYeNTu3oPJNLlSXPVxpOyHxGgPFA80F/ eS3tretQ+uprB1uw0VPjewMyzkJYKcWVuXTLa6KRyZfXVwCbd7U7nsDp Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/mxpegdec: Check for AVDISCARD_ALL 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: ye4qv/1nwwqS Fixes: Fixes NULL pointer dereference Fixes: 36610/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MXPEG_fuzzer-6052641783283712 Fixes: 37907/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MXPEG_fuzzer-4725170850365440 Fixes: 37904/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MXPEG_fuzzer-6367889262247936 Fixes: 38085/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MXPEG_fuzzer-5175270823297024 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/mxpegdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/mxpegdec.c b/libavcodec/mxpegdec.c index 7c97a9340e1..16e586c1e99 100644 --- a/libavcodec/mxpegdec.c +++ b/libavcodec/mxpegdec.c @@ -193,6 +193,9 @@ static int mxpeg_decode_frame(AVCodecContext *avctx, int start_code; int ret; + if (avctx->skip_frame == AVDISCARD_ALL) + return AVERROR_PATCHWELCOME; + buf_ptr = buf; buf_end = buf + buf_size; jpg->got_picture = 0;