From patchwork Tue Mar 15 22:34:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34788 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp3399260nkb; Tue, 15 Mar 2022 15:35:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwEwJbZ3QdyDjp+qlXGDqrGkxb8lfGNgd6YO4e/eg5hHKTB5781ri04BRDVqQ96ZrbYNrKt X-Received: by 2002:a17:907:160b:b0:6db:d4ea:8569 with SMTP id hb11-20020a170907160b00b006dbd4ea8569mr8716455ejc.244.1647383711566; Tue, 15 Mar 2022 15:35:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647383711; cv=none; d=google.com; s=arc-20160816; b=vHnasIeVPGO49I8vLtvmz/HVBmRb9mKHh69E0N/9FR9zOshGumjPmICpFni6LhnDHm sMfAa1WmXSXIOKAO+M+j7ge/IcJJHjnr8jePC61PPRWXzCs9XxUefbUbaEsd8G3Axfdi eSZxLko3tQMqiPGC3NyJEvnwuo6UHsnIcTt+/9nG9UbIbM2SMVSM5+RZuPSMrQzNFtYl DSQ2OrcdpO9Ask47Yrwib/tFBgUX5DtExVN+4Kt74Z+B9siHIbmavRd8fygcenAPdVzM 2K4mygCROfYxh/Hef/2232VYRqZMTOTPmlimQRkK+kPf/c0Boy3yULznB+FExILf+eYO OK4A== 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=lUqBo3smZhUkpuKkF44noDn4A/jdLXPBqqywrwD4vso=; b=dk33eTNY/R5QOSKPPW9nOdGBo+9608BauV4W5RKy+5YX39b2aYLr2+qDluFF3CliAW GQ2Yl/McmHiB8akVdSd63Al8ynQBoJC2rbf8EfBdZglcOeQ5giPSNp2dr6DFw96ahGfY QNzfoSofmq6tW2494FdEtBR/uaMlVAgRPxsHXA+Mqf1xFs5mXEgb7ZXpFrydCdqERkc6 mloRETghfb2mJCm63h2RXC10pxYX7BsPI+WXKYFcVZh5AmwIiLWd6YSia2y9Uh7b4PB/ 6DxdbphJTmViayYr0jia2YYoQ6ojIhGTAtS8bimPUTp0cSdodNOS5hV26mLnFp9cty7J Uuvg== 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 z18-20020a170906435200b006b558121950si168007ejm.629.2022.03.15.15.35.11; Tue, 15 Mar 2022 15:35:11 -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 6541968B102; Wed, 16 Mar 2022 00:35:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-3.mx.upcmail.net (vie01a-dmta-at03-3.mx.upcmail.net [62.179.121.153]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 322F7688166 for ; Wed, 16 Mar 2022 00:35:01 +0200 (EET) 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 1nUFkq-0007jE-BP for ffmpeg-devel@ffmpeg.org; Tue, 15 Mar 2022 23:35:00 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id UFk8nkM5uSgGFUFkqn8psv; Tue, 15 Mar 2022 23:35:00 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id UFkanLWFCOPqFUFkanEZHk; Tue, 15 Mar 2022 23:34:44 +0100 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=62311493 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=BNyQuem-fGlgBagnznYA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 15 Mar 2022 23:34:44 +0100 Message-Id: <20220315223444.3449-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfGUPTCPDI61GCBsd5+38LBN7vHFMj/JopjO7b1iZKUhRMuDVanMHwo907i+Wmmr/PDqUybmycrvJYZwZVandwvgQ8Gm3T2QcZrnyfAQj+jrBapoP++9p niiPN1YNjlF/uGe5yLKnkV1hJbPr+QeOPpnF5qw6TcuJ/putDTpEO5+jPG0wnNEiuYStMzcwcIiMHQ== Subject: [FFmpeg-devel] [PATCH] tools/target_dec_fuzzer: Fix build failure from channels API 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: r7hziQWn/wyv Regression since 2f8ccca2fa94ce256ff77baa18f462c1abd8d2cc and surrounding commits Signed-off-by: Michael Niedermayer --- tools/target_dec_fuzzer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index eaa26b0e62..3bd1eff3ce 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -47,6 +47,7 @@ #include "config.h" #include "libavutil/avassert.h" +#include "libavutil/avstring.h" #include "libavutil/cpu.h" #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" @@ -273,7 +274,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { extradata_size = bytestream2_get_le32(&gbc); ctx->sample_rate = bytestream2_get_le32(&gbc) & 0x7FFFFFFF; - ctx->ch_layout.channels = (unsigned)bytestream2_get_le32(&gbc) % FF_SANE_NB_CHANNELS; + ctx->ch_layout.nb_channels = (unsigned)bytestream2_get_le32(&gbc) % FF_SANE_NB_CHANNELS; ctx->block_align = bytestream2_get_le32(&gbc) & 0x7FFFFFFF; ctx->codec_tag = bytestream2_get_le32(&gbc); if (c->codec_tags) {