From patchwork Wed May 22 05:07:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49131 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp128945vqf; Tue, 21 May 2024 22:07:35 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXHOCZSvS5VM34h5fKbcYy4KXPj1y5t9sFWUeMaC09e1IF5ipICzqKCPsMCmT3N7j3KadJMKhSaMoYd+yX/Mz64sBlS1wG0PEiQsA== X-Google-Smtp-Source: AGHT+IHZ2FpxcBnp8mRNTiYNl4OqW+iqioMQ09CvoGIqu3V8m5qSyUsC4fHH5CLy/mD5frKIqA0T X-Received: by 2002:a17:906:7b49:b0:a59:b590:5d71 with SMTP id a640c23a62f3a-a62277406camr44906566b.0.1716354454601; Tue, 21 May 2024 22:07:34 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a5a8947c448si902047766b.242.2024.05.21.22.07.34; Tue, 21 May 2024 22:07:34 -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=@outlook.com header.s=selector1 header.b=EYn86FxE; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 484FC68D2C7; Wed, 22 May 2024 08:07:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2059.outbound.protection.outlook.com [40.92.89.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BB75668BDE1 for ; Wed, 22 May 2024 08:07:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jB8qvAb1VYWuP3pWquKm3dfDnUbO8ECr/N1QsRUqhfeQ9Ur8rGKWj9vfDfmeCDJ57X3tQOCFLQQ7V9vVtO0HORR5N7+Pxh78ekCgemTjqQaC79MfaDeHkSDc+CseFEYOc1z9RiWqK1wBqNkjBgkUAu5BYjp15mOmhb6g2s2TCrFZ4s8Y1nEOnpA9nkxtfDEqtpVqCfdvKlWBskCzEy80u7Npn5sItTEjWqg4U0ReEXOLEA2GJ8bamqw56+xA7/r7K4O8gHFcqhSyUKi1YDw2lN1GIxBu1lg07Ppue894X2jk87CE57seedYZACaGuASDYEVicSwGdOPmjy4nv+8xzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=E4Hhn5AlNxJNZkMJOpWqmzuNGk9Mg4dab7TEBsWDz54=; b=L8SE/H8qsudfdhmS3XlUeQYtf67FgxbmDt5kvSH5SrOwBa0PwzzbxF7OJsJH0aNsyXf3XhebNEeHYe2PWySAiQXE9mQweLZWIKCzt1XlGMmX+DmCbBshO/+mQmwT1QaQaEbTSFaVdfAmOe90mNYPiSJ8yfRnDnV52d/ad7Rs+8Cc1xb5X90BALZjw8lgMDcy0436+9h6hwj0d1dFY3/hdU/xgUdlGjPtK+vu5B3LKEgTsrENJVMfPHLgT5ISsUNGgx6+LiY0ThT5btceJOvLj+HCuCH4VNC6kLxTStc1XYO/TugtvJgZ3ZNKLVR3oJjCNgUU0gJTMHHERoxM3IAkng== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=E4Hhn5AlNxJNZkMJOpWqmzuNGk9Mg4dab7TEBsWDz54=; b=EYn86FxEVKhy661mtXKL3Ml0RKdjFuaElhMg1KBBMtVViRa4MF+pLiMgH5JdgMNi7V+1N7JMyRIrRISPkCvMC8bY/yLveqI+drzvrBtEJJP4uzp4fPFX9vEmnArSUaHvPDcCi+fWu2kEcD6kmZ6LQZ030v3HPIAPi83/WTWWCreMskSFaLzmqETooWb5GRMpIm5X/cufAesQKCfTlnW8iEp0UBqgkamHWOBmGho4HrA44xyDhRkVw8lLAhhOzLKj7LscfmXUtwgIVtPkl7xOSab4mS9bBAzTLi98J1IV4sf9NeIlduyb/oQIj+JL+P43NRYp+oGIetiggge+79Z+4w== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU0P250MB0550.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:34d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.30; Wed, 22 May 2024 05:07:23 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7587.030; Wed, 22 May 2024 05:07:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 May 2024 07:07:05 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [JPkXRvDJM8Yn6Li/yFcAi0eq6r8SVVi/j9WUXSLmfW4=] X-ClientProxiedBy: ZRAP278CA0006.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::16) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240522050710.3362591-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU0P250MB0550:EE_ X-MS-Office365-Filtering-Correlation-Id: ce224aad-77ba-4e46-f6fd-08dc7a1d1062 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: NP+1rzNfIaZ54mkGQmJ9FvedwxCoV0JWyxSLPZwh+EnbZV08kn82ijOEzmAWrBxxjSyhWtB0TMdeDJ2Cyum5HcVBFtnlZ0b62wkwFYQx/jh5UpYd4AxRzerKGrfTKk3oA3ljBpBFAnIAo9kErDTsO+wkawthV8j9asCfz5otE4DjtpEpHw1wJWcwpH6M+oMtYg9pDzos/qOOPBLoYqEWpfdvxVQUYtFz/bIxkxOGyeEkOXrsBpZDhHDDVGwBO+t8alRjJ9rVYZTau3MiZJusMVXzaOL/iaaU0PGgnMSH3qgj35s8H0dD+40u96HBV26zVxRwWoau9y38jDSs+S/z3TVmpoDmBqkrYKxulGUNk+7yxKryVEELKK0o8H5BBMYXRvDabFU+kCKZdKZKz44pEi5/sIJAedLAZS98QljVSfW0GHLYxOJ60oC2pC5Mhz+Pe6kCdd+ZV2jfRS62YxCfy0zISbYNCIr+9WxknZJQMqGeEWD/K1mxdf2lEEQPp+jfq944xoCXsMf7x9lF3BjtvGrFc2QbZN4rkEOw6mKRsDb2cyf21GTgWDSQ8Dr6vAV869KxVlq4qEVNTZY+o2dULJAvVABoYg8EHM2leo4HYO/UByKvTSSQIYRB7UiMOpVY X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2BC/pdnzUzPa1h2O0J7HaVbyaH60vXFGxdsEOcivUAynV2Z6hyyCaBoWTJaiJG81PJ4MYbuMnfGejpR7AWoB8tZHC83BpdyH4mhENHW13004IqBXT2r3xiwKGkt0jlElyT9tSFPwTAIf5dLdLVrJ/+GJPY9Gv1m63I4TzYIFp54uYuRmW6dVgb/Fvd2Nf6dHktkeLtlJkGD7+8e4rmIG/SM0+MAM6Bbu/xKp3btH70u48t23VlT5WIFINZwqJ7/92E4Mq1pKU8KYE5jpsSnCVBXgZ7WLg9g4+RrmrMLU9HKuWezfI5u+K6ifjZQ2FivjoAvYBrgYgjpxSpkX00RyDqqR6U8Jn9RxhP7lYCkmAkTv+2iPWforbVCF5paFg2nvVZEEoubBL5gSg3ss678TAXKIRZJ8JNWuOqpTRudfVBAlXlB6Sy1xD+88jItU6rDqkO9dhrXg2ODamZTyhe5fZEVHOhSbnaeDzosTGsYgKvV0fPuypPhrUV+MqVFC7QA+MuMuoHi/Rda1CLR5s1cm4SqM+qLFosbaogfsUMNcRJx97nsQ/kofRgEOaAQij5I+gN8RCHbMkoudCGlucu3YEvORQ82v/KyFnyBvmr3yagmdDHxgru7vj6RkHW1+aPdGNBr1MaLEW2lD9OKoPG1d5ivF3seGh6OyZ+oY7BH111C38W8gnm3MnxC81i5jm4Db42anhj2/QryFehbiN8pNpUMAzoxivdCzpKcIfTNyjh8IXfmL1om1XOfRH3Uq2hSm9cnNe0NA9vmzxMgY6xGm28vK/Yi9AoJJ6MLF11H7nzq1zLN8/r9BvYR3KIOpUG1Y3qNaZJM01BjWQOB+shwBbTMEEEmiRq5qChAN0A3KIt123hpGt/Qt9ecZphTrJ/Bb5x5ShzK7ZFC+yh06wPhsM1fVahE07t2sefv3a551/EnAjWNRR1TDMk+AXrHyIPaY3IMjKiLnqHdi4l+JoGQt1rniGidMs8NurjYEPz63SN3XA8Jd9Fj7H16VD1dMiVYNAiPzGYpq+CdvW5a+l7RdmE0T6C2G+HFRrNb3LJmm/psmE6/b3oUO+AVY8olWuHA7YL1KoAsF35LT70w6Ab33gXdYWEB/QqKRnjwwQDn/hetYLTT1omOV0A+dz0ubQXniBXimaTtCEs0eh0k7+OncauqYbtIfgA5Jb4JuCKHJl87yjiqQqGS99Cxh9GSED2Oop90cCwaiTKaPSkypwYNn+kbyL8r3MaYPOkGobfM3Jbh4ayKpiW0b4q1Xl3VkrnBfg2l0RFSFkAR7WRo5brHgUg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ce224aad-77ba-4e46-f6fd-08dc7a1d1062 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2024 05:07:22.9857 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0P250MB0550 Subject: [FFmpeg-devel] [PATCH 1/6] avformat/oggdec: Check ffio_ensure_seekback() 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: CWvr9h9Rl+UK Fixes Coverity issue #1492327. Signed-off-by: Andreas Rheinhardt --- libavformat/oggdec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 8ea81e5d45..5339fdd32c 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -364,7 +364,9 @@ static int ogg_read_page(AVFormatContext *s, int *sid, int probing) ffio_init_checksum(bc, ff_crc04C11DB7_update, 0x4fa9b05f); /* To rewind if checksum is bad/check magic on switches - this is the max packet size */ - ffio_ensure_seekback(bc, MAX_PAGE_SIZE); + ret = ffio_ensure_seekback(bc, MAX_PAGE_SIZE); + if (ret < 0) + return ret; start_pos = avio_tell(bc); version = avio_r8(bc);