From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
	by master.gitmailbox.com (Postfix) with ESMTPS id D0DFD4C64C
	for <ffmpegdev@gitmailbox.com>; Fri,  7 Feb 2025 16:48:17 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
	by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C4D7068BB43;
	Fri,  7 Feb 2025 18:48:13 +0200 (EET)
Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com
 [209.85.214.169])
 by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3750968B480
 for <ffmpeg-devel@ffmpeg.org>; Fri,  7 Feb 2025 18:48:07 +0200 (EET)
Received: by mail-pl1-f169.google.com with SMTP id
 d9443c01a7336-219f8263ae0so46070355ad.0
 for <ffmpeg-devel@ffmpeg.org>; Fri, 07 Feb 2025 08:48:07 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1738946885; x=1739551685; darn=ffmpeg.org;
 h=content-transfer-encoding:mime-version:message-id:date:subject:to
 :from:from:to:cc:subject:date:message-id:reply-to;
 bh=ZseoSpeXg7WX1QNO9yFORP4iiggkeNVcmb6pi1ZoUAA=;
 b=MsvJcLlAAGYXfxvfB9xyJcskE10ZCIH6Xhx0SskQs3w/GIk9z8mMC0fH0Mb3Ltn4gm
 93seKggH4yunNKD0Uz2lohav7PLU8bhFSiENsUCtLdcDb4mrNl/Yu5CUxLgXeKWg2La0
 Lj5GScQGwfv/sDnXGz8ibNwVmTa/h8xMbF+a/N+y/UqV9wXt2a/lG81GGtirkPuLsnfD
 hKkx1cNpdhLmkWvpj+Ou0pxW9P9MaSPeX75m6MBKw8JGdanGRlUIcaLFNgFof7AkXoei
 bK8BSrhXnBYxc9zkn9Q/54n+Ox7fDrkLaDc4EFBbFAe56oEsPfgZvJrlp/IiDQCdyyms
 DMbw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1738946885; x=1739551685;
 h=content-transfer-encoding:mime-version:message-id:date:subject:to
 :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
 bh=ZseoSpeXg7WX1QNO9yFORP4iiggkeNVcmb6pi1ZoUAA=;
 b=Olo/+qnG2amabpN8xQya6ZqEpHCRML4gKJ7AaxK7QsLhIxv9KcUt01v8sMPl5D3PpW
 8iSkyHlItbioTQKjykFmlejDyLPlBoH97+dmvvMyNCXtcrCRSSlcV7+GC+A1DluIxEpE
 foECapx6rvzUSsR0GxN1yiSWtzNNnuEN5pZKGH/Lmmz5v+syn/OBjsaODdsAx6RBbwlu
 R+WHkDpeQVzuZdJjmSxCKfg1aNofhf4cSMr2EbK57medW/5X4R/V6aAC5Kw9IcAV7Ams
 gsygFc9atqLHKml2VY9vYeLzJujASWpofnMcKMfRGzQgf6LL3vmK4IPziWhyryJh4vj2
 g97g==
X-Gm-Message-State: AOJu0YzvbuRR9lDVuykzhftiTwendr9kVLIfuXC+PYT6pCFDSMcdHM7X
 HkPH2VD5RixeZkgdJxBmxS2UZIWHOjKOBSypsulwk1KQTZSV8wz4VwjRdhYk
X-Gm-Gg: ASbGncthmGc7Yxs+Of98uazFcU1C2tnfuoRxozlcbq83AGDzZAxacegiT1qIwUWSp+T
 8jC8nhyhMUhZ/5aQqk8r+7KIi0zZ/k+dmk62SNB//OSb1IftQOPUUI34sKDrmQuPOxBeEdmfPyM
 c7dv6EWowlLSf7grLYIH6fA9kqoAMSnI4T4cSD2VC2wKGVZ4Wk9GgpMY3nZbMcIdPJ7S+5z/KFM
 sPPA3waNVWB+UdNxiE9DuJ55KKlWFFG19PuqNbjyDswXN91uCx8d0ZRy4rardN+jUfhyc8oxd9D
 fTvDPScFeyefSeu6lpvSV/W2RGwAoX79
X-Google-Smtp-Source: AGHT+IHa4q9SYCQlanPfOh39qz2ex/+yKzvnwajGHyRy6v4t7fqLBDN5CSaM25k2/xcVsleEFr5zVg==
X-Received: by 2002:a17:902:c952:b0:216:69ca:7707 with SMTP id
 d9443c01a7336-21f4e6d3383mr68892465ad.30.1738946884705; 
 Fri, 07 Feb 2025 08:48:04 -0800 (PST)
Received: from localhost.localdomain ([2800:2121:b040:c:d1b4:52e7:1b9b:e89c])
 by smtp.gmail.com with ESMTPSA id
 d9443c01a7336-21f3656125esm32902165ad.95.2025.02.07.08.48.03
 for <ffmpeg-devel@ffmpeg.org>
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 07 Feb 2025 08:48:04 -0800 (PST)
From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Fri,  7 Feb 2025 13:47:51 -0300
Message-ID: <20250207164751.2922-1-jamrial@gmail.com>
X-Mailer: git-send-email 2.48.1
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH] avcodec/vorbisdec: don't abort on EOD when
 decoding residuals
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250207164751.2922-1-jamrial@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>

Fixes ticket #11427

Signed-off-by: James Almer <jamrial@gmail.com>
---
It may be a good idea to ensure the timeout fuzzer case doesn't regress
after this.

 libavcodec/vorbisdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c
index 218e855f7a..321408723d 100644
--- a/libavcodec/vorbisdec.c
+++ b/libavcodec/vorbisdec.c
@@ -1470,7 +1470,7 @@ static av_always_inline int vorbis_residue_decode_internal(vorbis_context *vc,
                             vorbis_codebook codebook = vc->codebooks[vqbook];
 
                             if (get_bits_left(gb) <= 0)
-                                return AVERROR_INVALIDDATA;
+                                return 0;
 
                             if (vr_type == 0) {
 
-- 
2.48.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".