From patchwork Thu May 23 01:17:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49155 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp734497vqf; Wed, 22 May 2024 18:18:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXdByCu9FqLOx4l6F7V4LUZUy3Iz9qT0vkj/MZP6xh7qSo9uCVKz+jCiToL1uMCYq+Z6kZDZM+r6gsy7b6hGQUm9HDLLvRBkKHlow== X-Google-Smtp-Source: AGHT+IF1j4NTUUXxXjPXUThl07E1TlL1XWjoS9EfI4KzukMvV2dHEiJEkbcvL4N8YDV3P+DkxK85 X-Received: by 2002:a19:2d17:0:b0:51f:8ad:673f with SMTP id 2adb3069b0e04-526c1d97438mr1838862e87.5.1716427101413; Wed, 22 May 2024 18:18:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716427101; cv=none; d=google.com; s=arc-20160816; b=hmJNa66mGJ62b7ygovKqRh3Vii8C0mMYz6Jq+ExWvyKWuAPAcOiHs91GDtEQmnBXyD Hx1sGeGyWKSaIQD18xuCwC0n1SNwXNbAXUiX8YDr3nX5q8j92NPvO5UJggcp4/uieT3I 38p2+rSp0oIpAPPPoAWrjHGBv7P3+fuGq+STzpIEUYmQRrXv57ahu3F/IYidU8uSyssl 5U9jORESzzJJMIcUwgTtBNLw3rR3rePOCb0P5+yJ2C2zsG/bn7zyGnE7bqcQz76II2Va aLQQi/6c9cv9BDpQxSYq2wYGtPNi/49lLbBEVBOy4Ea2MKXNBbOtZd3UA+NiWghpOi4Q GOSw== 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=UYSghcv6eYmenhvZtGwSVsYRvzz9YVonBvZWmBTUSKI=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=VhbO9suyY4q3oE9Jjy7lXfThLDgRCjz6LMO8EmFutcfnoj6ZfdigWOEX4r4GOL/kIE 2NoSAQ4R0NbVLn15NhBIQCshrUHkSwZf0T4SLpOfsOqKxuzOe/YcFTzt6Mz5DQEueYGS 9sEQQ7SSF23lfGiG/96kouT4xj0EzM4iHjCxCrKQ0ecLDX3doWUa7hZY9ZiInb+2mLCs /Vn/TgJPkjrHGRMzVW1b4A6l49IeVTdibl4xtXFug354j350CPnMUBL9b30J3So+YVT9 0brO6wo59OVTJbxOd5LChgEm7QVJZ1n3PWK9S0vFknlgM7WJDj9i3K5khrhwAmOUN3aC PkTw==; 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="Zu8y3v8/"; 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 a640c23a62f3a-a5a17ba55ebsi1613882866b.610.2024.05.22.18.18.21; Wed, 22 May 2024 18:18:21 -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="Zu8y3v8/"; 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 A447F68D41C; Thu, 23 May 2024 04:18:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4739568D26B for ; Thu, 23 May 2024 04:18:01 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 74D0260002 for ; Thu, 23 May 2024 01:18:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1716427080; 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=mxzF1WaXs7DItuJLYzxrcW+ENYljawMAkj/uM/70iHI=; b=Zu8y3v8/pv35dl+Fc8eB/Q4z1ARtqecwYbCfWq7TdjVwCEFEiF6V/CWm5Ys30jGjHxDLW1 9X1xoAN5d9dwwX4zOqcdcWNg1Wz0/S/wEn8OVoeQExKwTuRlISTfKG4x9vuxZ6IPRgpAdF yazcVJ1MSCYL7kgsO+3RQA+TzH2D8DuATjGyWLLYxMy92CPAo8fPhip06gNxUVGQtOlsTu SFMM0w4xVOGxaYX2Ug50+fZOwp2amjuOcqg1jF4vfeJECJQTMQpadLDJmk8Hx20A2U8wsQ l6etiFCAnSbM1Hne+Ht11fttbTP9MVYODs3/q2F7ExtyPdva1eu9HNqO8maCAA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 23 May 2024 03:17:53 +0200 Message-ID: <20240523011758.2434580-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240523011758.2434580-1-michael@niedermayer.cc> References: <20240523011758.2434580-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/7] avformat/ac4dec: Check remaining space in ac4_probe() 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: vOovLZYaxB7U Fixes: CID1538298 Untrusted loop bound Fixes: undefined behavior Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavformat/ac4dec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/ac4dec.c b/libavformat/ac4dec.c index f647f557ccd..dc6638de3a4 100644 --- a/libavformat/ac4dec.c +++ b/libavformat/ac4dec.c @@ -43,6 +43,8 @@ static int ac4_probe(const AVProbeData *p) size += 4; if (buf[1] == 0x41) size += 2; + if (left < size) + break; max_frames++; left -= size; buf += size;