From patchwork Wed Jul 31 19:54:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50835 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:12d6:0:b0:489:2eb3:e4c4 with SMTP id 205csp712873vqs; Wed, 31 Jul 2024 12:54:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXl81QzDwqRgcgjszI3sJW5gTcyUrY5brE74oSSo0YoRwBtcNKKjA8UMkcgCkE/I+vExah2k/+In+vM20TcB4uibCjUOEtHhWdRig== X-Google-Smtp-Source: AGHT+IG397pcFU0zIDnrvIl6dbBvQ1L7u9Bv5JxWFuwv5qXPlzRR8mc54vEzfFdHxTWdzv19kvak X-Received: by 2002:a05:6512:3c94:b0:52f:d15f:d46b with SMTP id 2adb3069b0e04-530b61a9f63mr62719e87.14.1722455671128; Wed, 31 Jul 2024 12:54:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722455671; cv=none; d=google.com; s=arc-20160816; b=LsfPzB/tgKEGSM2HStL1Cx6A4f+WShARC0a2o6elKbF5k9u85LXxgUzi1CJfhAVfJP BHqIT5C3iHajHB2TdlNqdvnMoxR07f/Wr1TLbsOvGkJ3ojzGmd6r2YLUzPBiEIEJuZyi Bcs4mxUb2+hlUOPUh4aDR0PNiqEqvh3g2CebaxJaxhusHLKOso5JL7sP2vhULmIdS+ex hORSrh3gt3IHpHzD7shdM2ciK/5BCdmK4Ni2SgLOkQE8W5I6ICfm1jJVzm6X6UbbESYl lR84gZs+iWvz0R+zxHLSnB5M+T1paX7L5Ewduj0hjVOCyAhQIcbIhOasIUmStwX8uJOn 44AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=vhsZ3E2/02JojnJboy8eugi8HNdrtXJdaCx/xn+qxBY=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=rq/fMV83AXYUKgLaYpmSvnm9GpUsR+Xcd0QXoGBAsz3TU8KHi2/xRNrkQCs60+lCzv p1Ze0EzldCwXNHt18/UYl+w4fGQ9+0tl3yzYydULjwHFcytjRWZUIWUPTENh6Al5Cplg S8He5NEgB1otkVjz85bC1zRrIR+0+TcYZQDwUCpponFoeSWlHVgq+F7H/Sqpc9ofPpoI /QHUJYy7IBTOEKedvkA74aQYiUBlhiqOF/GCu6DO1MXq+yAET7Yf2nAY1kyCRAi96x0V QXB2tidENvylJI2Xy5F7EW7mPFj1bj7cAgkheKbZ8NHg17lix2PgReDns3AA4ElX/pjg P0sw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=QdkqaHPU; 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 2adb3069b0e04-52fd5b94e32si4331120e87.18.2024.07.31.12.54.30; Wed, 31 Jul 2024 12:54: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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=QdkqaHPU; 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 344E768D8E9; Wed, 31 Jul 2024 22:54:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0999968D872 for ; Wed, 31 Jul 2024 22:54:12 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 444BE1C0006 for ; Wed, 31 Jul 2024 19:54:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1722455652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Tl9OW7VQdZz4Lh6T+QKS6Wr9swSQ3jt2pXoSxIunqEA=; b=QdkqaHPUAp2onbi8o6ysr5CS8ohrpCuzhmQcaJTObzuYcCuQq1wmx6fZU+bl+PNA6d1z1B 91FgqGmomo8aD80/LzSVrAf4JSEd6sVCJOMvUMyMMAqhKoB07hlClURrVWNr5wz/Zsh4ry GlsVrRwq/LCJWRQ7sUYhVuyNSiH798oEp0xjzMXijPY4qylbETNNg/mcazNFlcH9iE6GUX sRZsZhXXIa8mRLea4DDC/AiB88oUEZRtLbqHqlT/O/y25QByVWV6gmAewfzxHv3vovNyO7 Nm8OReoNU2c+GRAuOHT0wqUzlCNIzlKTvxUSsKrXPcCUuHGrI0eIs+ZSALQ9HQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 31 Jul 2024 21:54:06 +0200 Message-ID: <20240731195410.274508-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240731195410.274508-1-michael@niedermayer.cc> References: <20240731195410.274508-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/6] avcodec/aac/aacdec_usac: Dont leave type at a invalid value 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /HkQLcsx6Aeb Fixes: Assertion 0 failed at libavcodec/aac/aacdec_usac.c:1646 Fixes: 70541/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_LATM_fuzzer-5190889543106560 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/aac/aacdec_usac.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c index 1b79d19a30f..82db65eb0d0 100644 --- a/libavcodec/aac/aacdec_usac.c +++ b/libavcodec/aac/aacdec_usac.c @@ -265,6 +265,7 @@ static int decode_usac_extension(AACDecContext *ac, AACUsacElemConfig *e, /* No configuration needed - fallthrough (len should be 0) */ default: skip_bits(gb, 8*ext_config_len); + e->ext.type = ID_EXT_ELE_FILL; break; };