From patchwork Sat Jul 31 17:48:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 29154 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp260845ioh; Sat, 31 Jul 2021 10:55:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxmSjQf3iLr16wP1HcovMfKZC4D619VKb9ogeNtdbcmp7IcKr3SFKXMFevFhttCmz9CrJZq X-Received: by 2002:a17:907:7e89:: with SMTP id qb9mr8275619ejc.333.1627754131982; Sat, 31 Jul 2021 10:55:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627754131; cv=none; d=google.com; s=arc-20160816; b=z5uWAV7JvGEL7iNKKoLO3aIRGWTbH1jPx5zR2wizrL3YPIW3GM8lFgpACWMRZ5Vv1k wG0/2gHNDvJBRAyUdMc53akwgfQzRmAmrBRae9lFFgVd6N71ingQ4ebzpJTxJoaoC0Y0 DvKGYfMGJG0tD9LDoffa9bb6Vy7j+sQuaH0Ab5Y17dNKfiFzrxJUUPCzIwEW8O3ui1hM HlaOYtudO41FSEP1kNds72URMNMBO1hQf5ObDhn/3mzVpHo4JWAs+TWmYVd1alMQwepq BpZxIBZzy21qHdeXnYrdayGOdbNEFkeCiqOZ1ZPPs5pwj27UGQL5ADVM4MzOJrtPO+v1 ZGqA== 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=i95szcrZcOrQRcklLhgfKKMkbDHL4mAwdjp/QZttU1s=; b=rRXfYBoXot6Z9r+ysnrkETp6ZATfHK5uEr4ihD1wXuHQF0K0T5DKtYgJrdzKlZ6C1E AQBxKL56xzoq5bnYEvTfY0krGm0fAqP0SEGkBw6fIBNwpKk4Zs1YK/nM/APL3n0xqyll k+mygeExY5O8Gkt5g6u4cDohEz4qYbNVNLhOvghd/2lUAvSNMbCFFxQMpHsRkhusbDdE xMZt6xwx8n7F4EfJhrm7ek3l9I0o+cD7waz4a/dgHZGDk7YBwyArpDXdHdhrdqZn6w8k C8OV7H1HdkKkMsYQsrYXDNZ0ck42HgWrDzpcIP9wnewh/oW31UHRTsQwYre+XmUElfu9 3gug== 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 a5si1245502ejv.350.2021.07.31.10.55.31; Sat, 31 Jul 2021 10:55:31 -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 EA7BC68A464; Sat, 31 Jul 2021 20:55:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-3.mx.upcmail.net (vie01a-dmta-pe04-3.mx.upcmail.net [62.179.121.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E722C68A441 for ; Sat, 31 Jul 2021 20:55:21 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1m9t7J-00DnCq-0K for ffmpeg-devel@ffmpeg.org; Sat, 31 Jul 2021 19:49:45 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 9t6LmFgpPljeH9t6Lm456v; Sat, 31 Jul 2021 19:48:45 +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=F9yIfp2FzRA4drVisssA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 31 Jul 2021 19:48:44 +0200 Message-Id: <20210731174844.16646-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210731174844.16646-1-michael@niedermayer.cc> References: <20210731174844.16646-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfKjELNe2WpoH9hm6hV45SDqpD7CKNl4h5iSRsun3qbXzeLkjpfj1hiWKJtjgKOf6/wG15Ko81/emaoIFPy9IzfMqphgAdcK489pLic3G2gNd6n95MepO BfO12nHE0ba8vcDrnJk4y2G8UHnzgU9JYjCT11pxkMFZG78L9LbpgpNk Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/argo: Check for even dimensions 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: D1WRNcjm/SWG Fixes: reading over the end Fixes: 36346/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ARGO_fuzzer-5366943107383296 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/argo.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/argo.c b/libavcodec/argo.c index bbdb6ae15f..df9aab92a8 100644 --- a/libavcodec/argo.c +++ b/libavcodec/argo.c @@ -684,6 +684,11 @@ static av_cold int decode_init(AVCodecContext *avctx) return AVERROR_PATCHWELCOME; } + if (avctx->width % 2 || avctx->height % 2) { + avpriv_request_sample(s, "Odd dimensions\n"); + return AVERROR_PATCHWELCOME; + } + s->frame = av_frame_alloc(); if (!s->frame) return AVERROR(ENOMEM);