From patchwork Sat Apr 27 18:51:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 48305 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1509:b0:1a9:af23:56c1 with SMTP id nq9csp1119019pzb; Sat, 27 Apr 2024 11:51:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVXxZjq5T6Yv8bSjFvr25PorzGmS2/SsidZUGsauL/7HkShoOQjSjD15oC0QjqeZlU6MuPJyipxb2M8GJ6vrMxGMg/KeJ1yKVIEGg== X-Google-Smtp-Source: AGHT+IG0Ge2fdj6dkGtzfl1Ult/4i0AfVDGHrXB/5Rtz8lX7nb4RFL+vXO0jMlauzENSwG4rNKAh X-Received: by 2002:a50:99d2:0:b0:56e:2c34:cfec with SMTP id n18-20020a5099d2000000b0056e2c34cfecmr3946935edb.7.1714243917258; Sat, 27 Apr 2024 11:51:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714243917; cv=none; d=google.com; s=arc-20160816; b=JiRIe7CObyi2rdwvY14qSRplZostvsatAHx6gBpAhQtgWm+6FiNMOxjF4MdSQOTsbY iYoSGbaTflmCZWMTYJa0B0kznFokWnvz5UlXqnWeLHLkCDI1+r7GuSF93vDJNlwLBdKu qH+Rr9PTQR2de3FWlx48vl5zEgoE+GpD10QvyQAHo7UdRUJfKGzqMhXx5pLNfiFg1skO Gf/KOVFxZLsUpEjLeMXwZkvv3GVMbmGISBfZ7gc2L/CH/Ylfxz+4vr5IHRjcFh4A2Llz hm7kFi8KoCxk8V9trwp5MRedDfE6cBsuh8ZCXl2AWmeHzynuAtLrWAdjmf9f/cMEKn8d hZaA== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=x3syl//L1lm1sc0BG3scEftshok76SEKc/bnZFicY9c=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=SSWNIMZFxlOWlk7hqZs7rrXlWgIaJM5JAzRkOTaTMtzYMyGi/0KPnT8eUB27MJ6jeS li6A4FQGtQC/isDVhhRxX+K0rzfthcy/5Tpwoi8yAFLGMyzbK7Ak2xBBuq9fVCFJmhfW vRJI4GM/IMDDEeYq4pvCShI4m+/5uoHDipLhT2e7Ln/14Yv/gNnyu7jg1pUBU9vBA+Fh pMatUy9INeWfJ9p+c1ky0TrfXuNzFrKU4jplE7aTyoFnmEjhui4PAnDlFxtL+OeUV0dv QSlbDVTYNefvajVDEX+XQe4Ov5TcXjXoy1CFbOAK4Zehr1bL3Ebfxafs7ZmM4c459Aa8 DbLg==; 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=Gy1yhqcH; 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 p7-20020a50cd87000000b0056e0e0bfef0si12511823edi.244.2024.04.27.11.51.56; Sat, 27 Apr 2024 11:51:57 -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=Gy1yhqcH; 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 7719D68D28C; Sat, 27 Apr 2024 21:51:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A88A368CF12 for ; Sat, 27 Apr 2024 21:51:46 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 0D695C0003 for ; Sat, 27 Apr 2024 18:51:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1714243906; 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; bh=n7pLM5hNQGGah53k+tn+FNMEQqOof6xiLspXrrY0luY=; b=Gy1yhqcHo/dcYX28PQaMHE6Ge3900Eas7UCLkqq+Rckha4zTfll+wUI7ifCwgpzWQZaToX 3cNCWH+fOylNwvSW0eKZYy1PgWScWA6lSsJKI2Iag1q5dt4MxiYRSHmKOVV31YrY5HoGGN WDCacn4QYQupKw5gZnS0+r6RaRyWUhiCpOBZJVbY0Mw0ypj/NRH6rr+/twZubj8nlbeyRU tllwB8itY45ksNK+3Veu5bPeDWrCWSrvAHrthzDSnQQLNBxoAo5+KXnkZwFNl/fI3jMoiQ +6iXaDPspsTPb6OX0OPaDWTHnVhdezGctrgFLHzglZ9+FTPEMQQUoBAa2FOlLQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 27 Apr 2024 20:51:45 +0200 Message-ID: <20240427185145.1458898-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.43.2 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH] avformat/iamfdec: check nb_streams in header read 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: lGzPjA13eFef Fixes: Assertion pkt->stream_index < (unsigned)s->nb_streams && "Invalid stream index.\n" failed at libavformat/demux.c:572 Fixes: 67890/clusterfuzz-testcase-minimized-ffmpeg_dem_IAMF_fuzzer-5166340789829632.fuzz Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/iamfdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/iamfdec.c b/libavformat/iamfdec.c index e34d13e74c5..ce6d4aa0647 100644 --- a/libavformat/iamfdec.c +++ b/libavformat/iamfdec.c @@ -154,6 +154,9 @@ static int iamf_read_header(AVFormatContext *s) } } + if (!s->nb_streams) + return AVERROR_INVALIDDATA; + return 0; }