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); From patchwork Wed May 22 05:08:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49132 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp129359vqf; Tue, 21 May 2024 22:08:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVR/1aP65UMMIX/xw9IOMPl4q+EOwC92d7EtG+OoSNtMYfqjHnNs9R89QImZbbF4qGOAgI1COGvYXAlj6z9DzowiBq1/pCk/wyKiw== X-Google-Smtp-Source: AGHT+IF1jfJeVM00DR3QelHLmCS0W2DE0i2nadem8HAUI/4iW2rEZO3oKSrcZ2cyS4sS9Gf+HYHn X-Received: by 2002:a05:6512:3196:b0:523:963b:3a1a with SMTP id 2adb3069b0e04-526becaa3e3mr434873e87.17.1716354537580; Tue, 21 May 2024 22:08:57 -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 4fb4d7f45d1cf-578302d6dcasi542675a12.512.2024.05.21.22.08.55; Tue, 21 May 2024 22:08: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=@outlook.com header.s=selector1 header.b="bO2C0YF/"; 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 7934E68D2FE; Wed, 22 May 2024 08:08:53 +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-db8eur05olkn2109.outbound.protection.outlook.com [40.92.89.109]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B37C368D1C4 for ; Wed, 22 May 2024 08:08:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WxFdlO2eYHwUsEGSheowAT2jix9ON7qGn54Z9Jh1xPcJs40/TLbq1JVPByv+1iVf2osBHwi3+m5FB5DGqFi30BR8pFxKfNfdyzkiLCZ+/0WVwvbX2S7TePGx5hNDoiOjHhUityHRKkOZhz+nEMvakfL0HKoCkPYf2QdBK/bgI2VMLwhJcYQsA6wBjyIhV9Xdf/go1iluDk9XRpMuB92/i0NPzBlbdEDyKr3VfNQism6k8AQVDhUvfmJA+Rb4jE3uIJiuRhpsyCPmrRA3aAWOx9r28d9LUROPq8nTYrB2EKjY4p4dlvD7XGnObizs+AXt9joCReMB5S567sGvR/hX3w== 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=fhONpKXydlt4YSta7JEEiPo2AiSGoLoor9k/Chpr+Hg=; b=XadBCgdfnOMnWSVMdGCPCnYXjLFe/+RsuBFcqzmDk0JGAuB/vuxXndUJdIxkPmDmUwvMHicqw4kLiFwkyPPWhQC2RNipl/GbRSnTOaOQhnEqi9KVUD1lYlAW3dRb9v6gUsVnP2A55OrdxYn9Q/BeQd7tcC6LlfLA1MeUTASSLUUMpSzMsILtR8slFjpuhH84dr75+KNo3ssOAI+57lrC6XWzbNQ8xMi2trdaHSpDqTI+KqX91WVia67Rzc5ekznjNUDqzXJRIj/uy/L0Zdvk9p1q29v9t5BvdZ7CnHS3m8lxMq3W/d/09eywZ4UGQDA1a5GUcU7Fq7C52krioBFt0Q== 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=fhONpKXydlt4YSta7JEEiPo2AiSGoLoor9k/Chpr+Hg=; b=bO2C0YF/r/frornETh4RyQPKU3MLxb1gEE2snSAycKc7v7w0BusIV0eGQogMhiMRyQ0rI2Jt7+AnRwoV5QTlTtEL0DwCPkhER+elArpyof4qSZvYDUGq+ww/dg0sre50nobKAYzlGqIIgtgsNhHM0o5Xdp58lppGnjbL8dpH2Mc+uKca5H8QD6NuLCiac+UArAX4tvxpLbqtndx0ev1lRdEmQNHX0oSXEhfVtOGj8ghORakatIpdANsu9Ocn15supLvR5Fv7dEDAVBM15Zx/IeOxfPbsAXj7Zxr+mzQzDzdRuy6iWjnrL9lChExgg3OZnXFiE7zJYlawM+7WxJv1Bg== 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:08:42 +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:08:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 May 2024 07:08:30 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [e2N8Z4SsDWw3f3wJO1XTnDOmCI0gLBLQsTkS7fhE2FA=] X-ClientProxiedBy: ZR2P278CA0081.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:65::17) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240522050834.3362672-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: 14d030ff-5fdb-4010-95c4-08dc7a1d3feb X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: e0hbgdfK5ptc2d/S2++xmAfp9XTqC2glhR5GjGqOgAJKYjVIQMzHjAyxI9PNM2zGxLtOX/ocFlRnk+Zc8oJPJlKc4Gd5UJkYyKBkvGx5qBVbUvd9GR1Msn9Tn4tpFMPX8k/8My2iiuH7lX6rE5OrvVLukUBQb58ef3JPeyknWWbd6jkqoMv47tzOfkpO9VUYT71p6/XKRO2WXWj2/OgUJXENUchNcvquJdtTy4PTAq0UhSRZSI0yedsZBtpEwoY1eehtA5FGoK43ajNTLpZ4dOZgxPMMWqD3he7x9k12rVYQtaJu+aF3pRCr/q3Nu6GJnIqcVXZexJHtJ9JAx51Oo4UPW51D+IElzUCOue74WRkYJ1dQrnPQNYF8T1AhBOvE7orN2yz6IbXVOZS6zTLQvZb4KR7D4vuJgB68XTvU2KpG95oQHGRdhRuJzW/v8dalsHhKKOAagwnXOzes5gGR6KhbVB/5lxuFoJr2DytaC5rrznCCdoNEtP7lqA1WS0aFqWeYE6nFdqAIKcczqTvKaxoSLU4C/K27xjyObSmj1M7O18c7W+CXOevkdbS/WkEXEhhx1NKqhYStEPBUtf70bIMSd5F5MnXt23e8cacekXeJldrbHl77qt0S8/Hr/hOo X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 20B3xsD5kp3NjldU7ZrSz/EpgCR7saTUb8m+AT4pCuwTgaKAAk6fYKxiFZIxAvV5s4rqU+DCCdg0HvLdOvLBECbC09ByD+jtKfXhrsYm7Um0LgLX3WoQjHz0KGlgjQ8a/ZKbTSnn0eI5J404Nd73bn+Jc0KoY18nTy/HQxIhNyqnnou6cW4IzZ/8JtugoPJ5kbj8Jdawp6LLJsc6vBCf3nhH1zlUITJX6m+votuPvOQUoNznZSQUXFbcaSvZ6BRZJpgbMXZjje6S9YhZwqxRHXYCqZp5oZHwC2L8ESLMz0XweEFe7iSY26wE9eLO10EEy6qHwjZId1kVpgKxqtk/kZT1sang4szw2TmixPtYRqwo3+33hvgyXPOu+LaKrbkOgrugKuaWuIX0vfNdT2SkupblbKmGJgqsw8UtzeEXu40J6ila8WdaL4usFHe1296s4vsBISsQhwro1c9uYYG0AB7ZclVeRVPbK65T1xcsuvy60dMxTppJULAV4EhmQPtW9F/kGTZz7aXSYp0l1olX7crKfIak2UoXBF4RzMKSNe9OHKpLN5KeoAOlG3nUqwX5Fl0Cxt6ccl9ieeO2FLm+Xu/TjdEpZn5LvQNFH1rMXSEkSA31UqRxOnSM7pUbwNzfgWSx9QSfHmBH5XQHD1Nyub6Oy6gBi9EQZzzl7RiqI0HwIsOJE9dbkJKAET/7KiW1Y8pDs9DAp6OiCU2X5ZsiB67kyhM0m95sJAhcpc5UTqAdWckrEGaLcPUA1nzVO2fExhLKUehud8E0luyyWh/DALEsA+8MKGhB3zkXRVGHeYrAfc+2E1hBmDiQ7XKqWIIodBxv0ckOMNYoV+PwdczWonI8gW+a3vMgZG0HvO3J8HYlFjb9hX+eYTlmvMD9t4gMFgd8+8fbnZ9zvvA7taAMBhbgX4XJTlOPat5jcsEbKlZvC/e875gBMWSKLoooygzRBxXHJln0pXqE0zPlnmNofaHP5F0x3r5Rht9mcoCcmtPNEdOay+uTOJVdxiQcTUs53p1724b3U+9RaWpgx5dlOJF6kQggaeoscZsUr/jg6xosnGyP1ttClD1yUxz9jbwrMu0gn5MHimq0qr5GoRKjFAI3TnEPXCNDqKXo/snnwY69fpREEJRSQmBRgc5Til2d3+RhdgccXaONxKaQjWwisT+r+K+XsgiY8HX3ErwRUKkt6tRG26oGkT/Jvh8YWZZFlNCT0y7gI8bhmaCOU+XIMTUNlGnH+UIAzr1GrvsoSc4Fsumb+mjQESU1e2hIgCgu4KiMfC5vPrmZMUK/vu+/IA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 14d030ff-5fdb-4010-95c4-08dc7a1d3feb 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:08:42.7105 (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 2/6] avformat/gifdec: 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: GOFUVBPKVn8B Fixes Coverity issue #1598400. Signed-off-by: Andreas Rheinhardt --- libavformat/gifdec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/gifdec.c b/libavformat/gifdec.c index 294007682b..d5f06adc64 100644 --- a/libavformat/gifdec.c +++ b/libavformat/gifdec.c @@ -85,7 +85,10 @@ static int gif_probe(const AVProbeData *p) static int resync(AVIOContext *pb) { - ffio_ensure_seekback(pb, 13); + int ret = ffio_ensure_seekback(pb, 13); + if (ret < 0) + return ret; + for (int i = 0; i < 6; i++) { int b = avio_r8(pb); if (b != gif87a_sig[i] && b != gif89a_sig[i]) From patchwork Wed May 22 05:08:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49133 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp129402vqf; Tue, 21 May 2024 22:09:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXnXmR4TDVtH4BkBwA/eYfZw3sD9YDP2VcKo6b7mMlb6lxObpSa/zjKvyxfvUYF2U3xatCBihcgHBmRhUmwmBweo5dPOXIYvHuQMg== X-Google-Smtp-Source: AGHT+IHoqUlGRUqHnIUwUBRB9/kML3s4DwYnBRv/I+TFtpjE7Pm6ZaW3A2QL2VO4F6n3kcLgYgie X-Received: by 2002:a17:906:4948:b0:a5a:6367:717e with SMTP id a640c23a62f3a-a62280d4f38mr44089166b.17.1716354545921; Tue, 21 May 2024 22:09:05 -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-a5a17945e5dsi1455343966b.201.2024.05.21.22.09.04; Tue, 21 May 2024 22:09:05 -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="R/EYQUgl"; 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 C30C568D3A1; Wed, 22 May 2024 08:08:58 +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-db8eur05olkn2109.outbound.protection.outlook.com [40.92.89.109]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0443868D2B5 for ; Wed, 22 May 2024 08:08:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jl2o4LTlGxsZGcS0n73OeQ3yUYfGXzfmhQt2jEpDe5kMKyNkdPgihMo7dxP5B+RxeI03CX3GGmEiKcXTE/qUZC2MnJcusDttCckpnlIzE/fK7yrXTEkYgsttSECjeUsOemZ3yvnybtkYrYiLH7QPhOBIp9uMMgF5sdPjoJNyvO3p+h935mxuDHB292Q1DPA4gxrHeE57fnvaSfS1iakI0ZkxSZ0huYWex3KMNhtYVTBssZoyrfQqcPC8PmJEnPbePaXVJCoCppku8Jbz4QXRZ9gRoYABJ8/rtd+jD/LWplC+Zwj9hNUp3BenynZvPcJ3Murdh0D+lgPNwHJDUmfYzg== 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=XouBulemIizj8HSm7HLgQE+KROSG3Niwa94USyM+QS8=; b=DZ648r3PBXzoIhiwkj6BiVayybKuasQ0DloMSW92pWk1EkRhtIebW5+sZW/p8mXIKtL+W/QFq4Rl75ZCXF6WunksuxEzMmCvXfVxGHKGXWHPwEg/O4hrSA2VJ265/6bZHhYD0TCkjbNQlHdsEbOqwA5ZLnfbQvNkh0Cw0LVhTtbFFciDD0Xjb62PueT3+3odux9tp7INjuE7CdxKqb/kT4djk++LPayO4Fo//cX0ST2VADdT7PP25YnO5Nylqc1A/9cPx9dUcNchutEdxH/kOMTfRc8lrB4iwJaCiiJOGWegAPYLSs79jdmGa6tQlH69GrcaCJYJFKZ7CQaM6zqi8A== 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=XouBulemIizj8HSm7HLgQE+KROSG3Niwa94USyM+QS8=; b=R/EYQUglEWs9TTaeCfjL3+ueh+tu05ivQ05wiz7dP3iEZ/s8133+ovcxc2lzzcslbu7HiCfxTqYGPCzl9cxq+984iwt+VNxQc433Uv1ReML+r1yds9hlh59qV/Z1A4NctYL3te9h48NfMOyeb1tyWJlgCxhz5TKTAWtGQ7msLHZqzc2lT1URUAoYfIoprc9Qu4dcle3bu0zYY6xoI9702zIm+64leDc7g37EZD+Rba+FC23VQ/iSbmJFPfxd/HmYcCLmcifBhSaAh1RwGv37jWQJ4B9o4PMkr75HXZrfQYPsZwlVRJnEjrSYeOH0Tt2+ukzm541qXi+lUepGQUHLBQ== 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:08:49 +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:08:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 May 2024 07:08:31 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [xlSDLyLEv/9/Of75Vc5zsR2OToq4KnNM7IWaKRT4ioo=] X-ClientProxiedBy: ZR2P278CA0081.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:65::17) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240522050834.3362672-2-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: 63e227a9-bd84-4912-9466-08dc7a1d43b0 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: dNREfH+xoOxa3r1XrtXQQHdn0csUazd9Om4kQJCiphbuFhcHYWfjHq1pOP507LnrCUMnjT884sskk0IpnGGTSJwwuJhSbyncBQ4JMH+rSsnE1uhkpYlQ3SR1LQ6eRwxT0B6GqWzH3uZpTQBM9S2TmZ5FGyv01EVABcva03S2lrATy/tDU4cW7Q/PNj1sXHTPOsAIWfrOEhH4IEds9Xwh0LUdUzi6hqbdsiDoG8Df8fzpT2Y2ygd9eNpfaumeW8QUwBBctWvxTi+iBGyDazwwegD8N25U3Vq1MjHZuIzwGHnkk2Q1urO4RjXdomZM9mlIoDcU8eTxJbqroL7aAxlCJg+GEqMhh/69Xq0azTNlKhpCXEr0Y75JPMjktRBycUzEAwNCvVgoYhuHHmN96CkLGarbEJC8b2Ni9Cg5mSc7ZU8eOGOQWxyXXFee4+xHoVBFDzV6178aYqe+qK+I2lcok7D7ZXWez8F7LzlpLIiCmX91bc23hjhIIdUbjfry9/124/B5tu6f454WNnB+FzCFLgZvQ80koFZ9/wdfD9IRFDAy46aXocYF4SwnLc7/3D4UrvKi3LJKWVmol4kMJ8HH+UoAOYQpVllUM2NmSZTNpx0+y+So0P2YG4bSxFZNrq/H X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: w/XQnswb/cDr31dtPYTc5CFwJcB567ezri3lw8jljGDvK7WnMhYgSZNgIExZiY0xvcnRdmFszYiQsbinfuHSNYY96nRp0UDz9aqiyfnMkPP5S9HlIdhKjPnUIQvisYx4N4oqzKXD+vFIYVK5KWANmA0/M0c1+9LdUA72d7MATCKuVdqLnDkECg9CavL4DwXTIZCWHR7DxcDICPbpguPdqP2+aVmwwxsULQZa2VcrlnKVM5J3E0FV6Cho3YpJmTbr8MEC3wS0Pgzq++CBklyAU8DUv7WQ5OOo8PKzU1CG3wYUcfOaY15glmJyFaZtAUKMTg2FZhio8YOwSLN4bCrga2SFVMUfYmj6YRI63wQH1hHRmfUVvzSt6BQEsYYkImrvyS/5vYaFvFNi91mFY+AzTj/3hbkzwLWaM7misv+9+e635rQdFnhsp5V/NyxYBe1tERDuBgUatK6gaXWdiRpXMVi2LOtA4BiI1XuK7M6mbLFyC4wKSCI0rUWtZMDte82ON9vaNaVutzgr4Vi08jwIU+O48pqQJXPmrK2xoFv66ErpsphRxIuEB6MDdS5In9rhBdIxLNvw6y3Zg4DGrPFWhNGY8c9qb+HYw/VshtO+ASJLwlzjCHd6Q5AP4Cej0o/l/PTMfK7oWSJ6C6tHHD6Sv/Q3QMZlRwucg5a9iVFEZMt6SZol4XyZs4INmvxbn6O5qPyR5ILdzpVre/ouWI05ZzMyikXdnmPuq/ximBzwaCGmFCf40dXVvdYADGRk+Q9mgtZWWUxpOP0hvL+IYubGjoOBsx9Fm5EEFe4SFGEWEBEFj1Qk7UofUK6dsoefeQnFkR6myQgmPq/8kPBkTxZNAlbh4AoZc9BJk7ZxiEA+LSlCTAvUbo+eYrI5EWQL8yRUuq7bgFzCBzaNFrl/VMU1e0j+IiL36yhJCNHvf0d+bR9L0HahgDhGhxpCDJQVyan62a4hCc3zShnPXJr/tmY7gSSeX3Tl7BlxqVMosKIt4X/BXOxOrr8B4R65HMjZp8WpvKvDE1RJx5Ew6D1ut+c7f7OJYoK7melDhWGWFfa2Ds0EM/H4LAqAIfBOwn5HoMEdK2o5vAyngphPDbNElxb1Pu2zpChcrmjg1zBvSAP9oMD/htd3QK1aw+pHDjVDbCK+CBdJ41sCEzdzouF4HhX44FADOtgwqMJL5ZGPw/+e5QLeFjmSR3CVFnALEI5pf62s/KBvU8ic3mfiWppJ12iT37/WTUHz5qNIQzFjEcLNhtaDyp9q89R6Bqtbwnpzj4Ru9Z2tb2j/sO7bwuOi0uHyMA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 63e227a9-bd84-4912-9466-08dc7a1d43b0 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:08:49.0430 (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 3/6] avformat/westwood_vqa: 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: G67ayRrVOkTY Fixes Coverity issue #1598405. Signed-off-by: Andreas Rheinhardt --- libavformat/westwood_vqa.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/westwood_vqa.c b/libavformat/westwood_vqa.c index 3a31e3f5e8..9755fcc9c1 100644 --- a/libavformat/westwood_vqa.c +++ b/libavformat/westwood_vqa.c @@ -201,8 +201,10 @@ static int wsvqa_read_packet(AVFormatContext *s, /* We need a big seekback buffer because there can be SNxx, VIEW and ZBUF * chunks (<512 KiB total) in the stream before we read VQFR (<256 KiB) and * seek back here. */ - ffio_ensure_seekback(pb, wsvqa->vqfl_chunk_size + (512 + 256) * 1024); + ret = ffio_ensure_seekback(pb, wsvqa->vqfl_chunk_size + (512 + 256) * 1024); avio_skip(pb, chunk_size + skip_byte); + if (ret < 0) + return ret; continue; } else if ((chunk_type == SND0_TAG) || (chunk_type == SND1_TAG) || (chunk_type == SND2_TAG) || (chunk_type == VQFR_TAG)) { From patchwork Wed May 22 05:08:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49134 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp129442vqf; Tue, 21 May 2024 22:09:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWw2A+mrDJxJYMeZdEv8fOMD65sWi/06T7K5mNa0Hifj8sI4i+lFvUKm9eb/4s4ykHTsyoYtlwPX0rgZfmeud8fr+hhUYmvWyIpvg== X-Google-Smtp-Source: AGHT+IGBnQftsrByfwizbWTZbGzFqPcYB2mbTMvahP0mJD4G1fRQ7OaFCNpNcKK8mbavuA1k6gs/ X-Received: by 2002:a05:6512:24f:b0:522:2a1b:2c75 with SMTP id 2adb3069b0e04-526bf6430b6mr472780e87.47.1716354553141; Tue, 21 May 2024 22:09:13 -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 4fb4d7f45d1cf-5733c32c4c8si3747695a12.429.2024.05.21.22.09.12; Tue, 21 May 2024 22:09:13 -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=gbA9N4hr; 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 DB85568D3E9; Wed, 22 May 2024 08:09:03 +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-db8eur05olkn2109.outbound.protection.outlook.com [40.92.89.109]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2638768D3C6 for ; Wed, 22 May 2024 08:08:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n/CKkG4ldAriTMKsOCXZMIIwKfLgMPfX5BnpzSNH6K28OdhOO5JVC0Ue4Bme8L7YS9tfSSE797vdip/L8/g+cXvi/pvo876BjuUcs4UVMf/vpE6q+o0fDOc1q3qSRJgCYPZmFcQBhYQNozWQ1pEjK5Jgq8m2rq64kXxERQsALCbh4hIMwNFpqbfjyFr92vJxNY5vjTdzzujGpdZ2TaLPuNG70c24XKBSsL4yAqgOoIIqOvJPVSdIYvaIghwHZpm1gvjokrt4wtXFafKATA4vx7ZdyVnjcTLxWmu6aPN9cfFCwVOGSPG5EWSqtp9DS+/3F/nxhbH3uR19xAVXNllOlw== 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=mNvCSRwGkp6eJAjUOTsz9HkuxNwxmEnY1ktjbT1bgqo=; b=NcGQ94+Z9QthBfP2M5McylMrIsNhmf/AAodpn1RP8yGkPJjwiPddlTaO0N9w6tQAXEJopBeKQJA8TWFuBDW6LBLumVNOQFvrRparLKRjYvGhfsPAGIbl63Bl2id4GresCqTDzRcUoo5q4G5jhcNQRDNlK+Ak0Xe3udfOMwPdhqN4gLRuVnHt5fUYjj8DUlsjOKkAfBi2tgj1G4Vtv/XcYTjoXUcRRBoSo3LWfkyBKJShNqqI+zNGB+8GAi5umr8pOygJnoDNOqFfAf3z5YZQ1z9QLkCY6WJ1FTsFZi+Az1NVe0kBjV5++0Co0P4anM8SQWbPkTCO49ldamxEPN5tsQ== 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=mNvCSRwGkp6eJAjUOTsz9HkuxNwxmEnY1ktjbT1bgqo=; b=gbA9N4hrZu7BWjHQQDVQ9KaSgqlAzptXd/1E4GLAmTRT+1Rk9vQo2H++UbSEbmoWMv0rH8CCTOKlMyrqv/GOO91vYGP4I2dpQBx6EoePUdeJYtlarhu1inKF9oLvfH7qQ3Yu6AvC01vd8O7suAK9d4bVL5o7B0ghzbheO7CGIqzssQqJjOhGYKs2xkI2CMDYhNhDreQg8/WtBeAYTkrg2xg4UrG3wc9P1bGv41vEzrs2xPlIp/TW2TG4SLYkOhVLrMtP5zhZVaUWskyrPWB+4Sq0Rt4iDDlbnsoSheuBptdmxAikq31bmi9ZWfz0HtolabOHyZG7VPWh7JVf4QDE3A== 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:08:50 +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:08:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 May 2024 07:08:32 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [IFb8sYPm3/e7vm0wdqCyWk6ROafvp2yNlevVR+JPDpA=] X-ClientProxiedBy: ZR2P278CA0081.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:65::17) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240522050834.3362672-3-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: f4e7b7be-40c2-400e-2096-08dc7a1d4492 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: 1pcPVfy50hKmPixM8ofVXDCIfNdpSR7XMFsKsezVeasUQuYaLJIr9WLeX/Cdt7nV+AP7+1UF4feLNNs9V0umf8vZ41QNjSQh36UbsL/HsEELnBsJaD5qB3xaTsuwgr8xgMjTjW/ABbqC9CcMg4bNfzE0KDlBhwi/lf5MZslY67ObD9LCSAPzagcL7Kbt7tQICux9CRaVzs674s68dOZPakHM38JZUekDDudJkB1JKlQw81yp78wanNY+k0WYnZLXmgNcKrTK/iGg/zSU2bhvKwTOKMQb8d0Q5V5cDvNd2Pqlo9yAPLCXrLKFbt/AsDl2A8GoHxoZayWzGN902v/vqfjK9AK9+fGPuydc1PO7jqfGSCRKJhmwRYJ+2iH9DWVXpZYCCEOq/EAwpCc6g3OcPhZAMPbirsA7aa5z5GAJbJz1A+F2aXg44ByhRBIMB7huYKz98Adxrvv7Sj13S6m3Ipm8bGZ6sBK5q9CKXW7MnhgF4+Rw9QXOYI7MHFuJq+p3kBvIMm7YOPSL9D6jjazUK3vJixFVVronkBOA2H/W6Nbrj4EYz0Yz4gSqqrQEWke07O4lefn4DpGN7obgG0XqhrNANlWs71lhneqF44wi5q69FdzCAWUMxCCUWEhSUr8M X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IAUBSUTDhRtwed0oOkgbIWkWs5/ApzXslPge9cMFQIrt5gUDFXL8XS5WT5rFvk0MP7/506qTIZ5d83yh0lnFzxcx1YMDwPCmrGIxR/eBdp8X1xaf2arbePiPtYcnDnbedVpqKGjx1Xs168gXvL0JO2HhukrMyVzlLreIBq35RAR1M/lWhiCMHHEab1OcAdHTJoFYRQR3Kn9TaWT7xFNxdYk6O+o4Uk7m1X93HRU4t64tjCe4m6RwkRqLWinxqd9jrur+4lNvQDazf6FO5fS9l4biyt/rqNAbcI25pYvmJgaNK+z58oEJNGz5q4KOYk7ipYa84i1QYgGwObLautypMHUAr4aHnLk5DUgOUqUKXxOAWlQj6NWWwqXoaoCJMGLZIMWpHO5BRCBMOgTw6GZYXKhRogTQVvnenDkMD2L+4vnswGbjOdiNRd/jYL5J4Hw/CLS9d158KxwKCBHjZ8g7KvRGA2WzqJJHjAy9MEcHczfUYWFHTcpimsizIzOyt2MJ1CLAukKMwB+x0VzZGt9PQx7RE5sTnrnqjzNFVJ+J8unL+TG4/uGvbbIlqVNrdci9rcwJ17I+DcsKXCdlh+GFRc9u4++/bKcseXoxH5j00JdZ7atUKweFdiqvJFdqky4QMi3lV5UR3p6DLM/GSpE6BZ2NTJ5aI+eUJd06yjtftjzQ9j4NXsjK9/i7kl+4pdH+UtAgSf3XwT7jljuc/v2Li3OwNbQt53d5m+3q3qypFLs2EqHjp6IixB7+qGsO2DvTV3jyfvCDjYpfCYatcPcupkbAYaD4zb9zqcUKmt01YRuFG8DF2/KpLRCLah0b3laLOo+N9mpECLTNl06esmKFAh3qIbxveiJde27GxwSdp8LUAc4Iz+X1ewLxG8gGAkp92z8cnIgllEc8tOdbwyETAx6A9HKSZrfn5GWkBhw1pD3YruCIdHOjUosmG4VzcfUnFOOsFZtL4Z2ymoyaOpj+J8nbnEX05IoHGEHXGOcZ6i9vlZQ4a5pZMl98iYzSOqaBT8bTUrXH7VzJwx69g6xQals+ezWX91GLvuszjFs9rJuXDCPQzQXVP+7zWCIXxB5m7Ej+rflSPR1igNokP4pYjN4Jmph70GX7/TAj1z7n1rM2pm4uoL/Z9rT5AX0WTA9YYUh+PMi4S73N5n2YDyZR4c0hDK2t+xxnF+YC2CZWoe6SU7tFvB23VMVEy5PRuf+Sy1yaXNLUFH/F/iZom7wvvxQ92/n4Koh2aKzht+pW3Zup+LM32E44lZJuKWT7GBDdI5UTlyVLMWxqSjb3TvkFNA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f4e7b7be-40c2-400e-2096-08dc7a1d4492 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:08:50.5571 (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 4/6] avformat/qoadec: 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: rIWHzZJvHLG2 Fixes Coverity issue #1598406. Signed-off-by: Andreas Rheinhardt --- libavformat/qoadec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/qoadec.c b/libavformat/qoadec.c index 9cce5157fc..a9632c46c3 100644 --- a/libavformat/qoadec.c +++ b/libavformat/qoadec.c @@ -41,6 +41,7 @@ static int qoa_read_header(AVFormatContext *s) { AVIOContext *pb = s->pb; AVStream *st; + int ret; st = avformat_new_stream(s, NULL); if (!st) @@ -52,7 +53,9 @@ static int qoa_read_header(AVFormatContext *s) st->duration = avio_rb32(pb); st->start_time = 0; - ffio_ensure_seekback(pb, 4); + ret = ffio_ensure_seekback(pb, 4); + if (ret < 0) + return ret; st->codecpar->ch_layout.nb_channels = avio_r8(pb); if (st->codecpar->ch_layout.nb_channels == 0) return AVERROR_INVALIDDATA; From patchwork Wed May 22 05:08:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49135 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp129481vqf; Tue, 21 May 2024 22:09:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXCtuZsOv248WoMzAxA/TLnwHxPhPmbc4RBIhrnUY+fg5r1vIiTVGQVmsruJnXUMyrcb4sq5iJ7wJEBPIh7OVz/Iqkm8IMbjPxAPw== X-Google-Smtp-Source: AGHT+IEMsxanTvqP5gWLe5eV0WZZwzW65akBtTeXstke+pOP7nIWKP34WgRG8JGLR3KPl+0HeN6X X-Received: by 2002:a17:906:f6d8:b0:a5a:8aea:343f with SMTP id a640c23a62f3a-a6228179528mr46181166b.6.1716354561442; Tue, 21 May 2024 22:09:21 -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-a5a17be6a18si1585021266b.806.2024.05.21.22.09.20; Tue, 21 May 2024 22:09: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=@outlook.com header.s=selector1 header.b=Pzd6zFUR; 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 F20FE68D3E5; Wed, 22 May 2024 08:09:08 +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-db8eur05olkn2109.outbound.protection.outlook.com [40.92.89.109]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D8F9068D27C for ; Wed, 22 May 2024 08:09:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dlnVJq27QJUedmS+Vuq/0+d3s8RJhn4r6A7AQ+N3PgNHpsxQO2K5TxZnoP//3zXH8OCOYV2GjLSU3hpYugGbyANhoxq0VSTJ1QpcJ4XdaUt77VxveFv2jUD37QLAu4IfIrCivO0VmLbJ+tORFsnhA21Gb3ZgXhOeK6Gm3xV9xCf6NnRbRn8QfcJ5DFNMhvN7gY3O4RHweqDtDeFw7qVVT/n6/Uduv/g+qaubHTiyntRM5nkCMFg7aoyqv53JfFv15EmkP6++d7937f99b5GyskBUFPJOtCO84sj8brqf31ChJvTRRwd+gBE2zYTw20FYuwVjq+cSOm836zy/tHKSZg== 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=NTkPMvnP1SQopMAVw3Y78tUIbTCsPCr4Y+6GEEVpxRw=; b=R0/EWZXcK9s0pQyxFkwUTVkLWONyF24CIvst2lGjOgXYeQd9y87YSWw1Rib+hKLtwZUjMYx0BhGdOrkl843AgPVENZMF63VMcVqmw9G/gMxP+UmT45emv/xj/qP26C8o7PHnje4Vw4Dd62nf7Yf3IPi5gKP/kYwCJzEqj9p99CncewDNdvJhpaHqFo5uUfvLoWnQN+AleBtV7vW3XfBEYyJ7hBSGcnkglVygJU4Nm1LulUB2vOU3e7+BdKUGq+89+44oz3q4sTaXCa9Rnbq4Tbk9IUt9Z9DoYrenmyFpwRZA+aFCjGVeDncSP3Bfy7NAJW4QSQtW86KgfvqRI/cZQQ== 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=NTkPMvnP1SQopMAVw3Y78tUIbTCsPCr4Y+6GEEVpxRw=; b=Pzd6zFUR2R5KIQAkka+p4gNdNyGHSViRbJ2glwHIsrdMSIDmPAiyMj4kZZ1jab8GHK15r4Nwy8Op5NoYkIDAzuC7Eqwru4j8kZoruhsivKRwnuqcIO/rRh6C8r9vPIGY6HRzwY85tP1SSiG59F9ykmqqw4jFuMhCaZgy9bQ6N6krTb8FLD16BBI+sVszW2Hj995IqRQ+qpM2ypYWQf6sGJl5ELd/IVK7jUup8F49+a1265xlRqqhW5XI46TnZFbMOcVyzGiJcmGvIXm9jKifsFMH44i2MbgkF7YUVnO9Ju0b1OK9unDOpQdTQflWt6azpKmAzH3Y4qdhTPPCkW+qkQ== 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:08:51 +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:08:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 May 2024 07:08:33 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [7jMvSYiIysv2b/tPoQcn4OkqtKG9YbATGRHXsS2ha8g=] X-ClientProxiedBy: ZR2P278CA0081.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:65::17) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240522050834.3362672-4-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: 39a8d32b-389c-49e5-af26-08dc7a1d4561 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: 1EkDuhqsx/GNaRsrQByokrsc+m96hlrENWXZ6+vYXr4i904k3HFw5PjmGP2tkUKlxFWFrE9fyT74dffSXaoIQi2GaJYLpTWe7h9yfWQOP+aDm2wFNZYHl841O8Y6nU/kD/c0rsyBp6ijzxdbr0+8Dm7scMA3egXitwS5OOWNLTrq/TT6LDj1NIXi4hGQWPSS23fxZ84xTowFonh0nxS4ujDEheJ3QF1TCo3zuq6X7brRVwRXGNbvszOgSbHeVaAHlvO6c3BLRmlnWUfLBYzQQhSR+HVWR5juHB3+cNR6mZVJjq+1Nqb21O/Pw5gsI4n9BVynx/K5nELRCqejh6a1jb0X2hxEGuhYHjTQAef8O5JGyM3bJp0XE39JF0OjajuqPaT7d1A/uRPuSRcyeLlWQNEJD40XqMfefyTwOINafZsNSiqp+rMhDFfEvr3TOHKqtILzazgDq/g/LKvCk7NpaC3BQUK2TkntgYk8YbtrdkKOjakSOIvAg4p6SsDv3dk17zl2gDBAJEzEE2hezM+ecGunSrIf9LmxN4maaxMxKKYtuNuvBK/P8NKIOpADMUmBTneTJY7XwncnhQllPc/KPUmNWsqKoo7TLlR68gk9zyqSam2ArqIRs+AXpiqhy6XS X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bY3NSpElJemD/LzsMeJtClOnVZkX6qJqEhjyIGg+H4lxGJFdytF06jSy7Vxr+y2rWffRWi2w3bpiPJkB7GsZZT4u0vgZbWeYVVLVTHDS1RYqC5uv37/XDgwG1pKxusMIL57BjWWZ5AJhIQ2vZJLCsA/otbqrNFFT/MToqpa/kGGxUaI3YE2zEq7YBwtDs2fo2ETb77e61BGG1JdjbNWwhUXPlPYgkj3Nz1+tnveu02qN2lX6T6FDJYz5be+QDj6EMidVeVKHvGRS/NgZuC++WV2+EPaRwWjxLWWQHG2r9NomDYNnxmY0t1VuajJBnuwAXKrR9JbJFS6BDp2dLstlZGUD7fMtxL+du4jJZNHFZPiM2D0tNaPKkTHmPW5HF83vX2Ie8DdholXqy9bPCWXcRVRdjWbkLUfYZLI/zQlaCWTaxOsCKEyO4z4b8RWvWW+hQ4F7/eKkLHInLS8roR3j79e6F2Wn6owW1KCq70YECe6CNCynxhuwKfVRKMCtfyofRZruJIoP18JdkrQgvzn29nkjgOOmbwtG4QCNovfvyzUILI307LHR9QGXDaOuiuV11bknU9AVlzqu0RRb5sjDWrwyOZ2i7/VcUMcyF2SQSiuLQI83ridO/hm7J+khmWRbEx87aMri0fc+GVM/1cdDEHT3U6Gz7C2TBaZ2dBH2BltkA2eBv2j65vyYMRVPeiHLlKIq4Vy/4wNoTGlcCULIVlXLADRT3aYEeOP0qFa28D6c5SO5/l8jmKK6wzYn47lK7vQh5bCTAzJIV6Z57iLrm5NwTkM680Y1+mSMXtNpa8mknwHaNYKEYcBQ4EHbtK2BCs+KxXHSh8voGCij2XbC5g41d90hNMMQHIjoF+YRM0uYETzWsyiZCA2lgXzyFOO6UZTWzovBdaPSINMl0/DsbV1YYcGqJcRY8+4gSuYNbfbpwA5vjGJ+kprkJJlmx1ApSOriFmQtclEDdLUD+q/X9iQBr8sjoVqz7Fe+kdDJosIpBJX7xaCA9xAyHhF97e+xmL9oUhK94dEcTRMSKayFIiZD/vgJ30ADlb4KCNRbDcm3xEaZsBrSWGDw2+1NwanGbjjTTpSfmzv/pQXpZBWv0c2RDtTcwmCpbqmiv1MQVduHO/FgxBeTh9B/2i/TVobd+aVevtnS5bu4jmkDhl5dmP23NeBG1vNp6b8SkpGBulcbSqmZ1tR42zjxAeRYeU7ZL1WGYIjYjdT3gDfaKKpn4K5zxc5Ab/+fFoEaWvh5gafgOAW6O+X2mAUWqc9vQnLlPeaVMYpFPfTOSIofQP+n9g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 39a8d32b-389c-49e5-af26-08dc7a1d4561 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:08:51.8846 (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 5/6] avformat/dhav: 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: ZM/TWqJHSI6Q Fixes Coverity issue #1492324. Signed-off-by: Andreas Rheinhardt --- libavformat/dhav.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/dhav.c b/libavformat/dhav.c index 303fb42bed..8e08274e68 100644 --- a/libavformat/dhav.c +++ b/libavformat/dhav.c @@ -273,8 +273,11 @@ static int dhav_read_header(AVFormatContext *s) { DHAVContext *dhav = s->priv_data; uint8_t signature[5]; + int ret = ffio_ensure_seekback(s->pb, 5); + + if (ret < 0) + return ret; - ffio_ensure_seekback(s->pb, 5); avio_read(s->pb, signature, sizeof(signature)); if (!memcmp(signature, "DAHUA", 5)) { avio_skip(s->pb, 0x400 - 5); From patchwork Wed May 22 05:08:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49136 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp129514vqf; Tue, 21 May 2024 22:09:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX643UyanVdy9snijOHKV6nA7P+cGmX1DWyjw/Z5SpSaXaDPQ4ISAXi3LE9baoO1CT19Q/EYrHyE5y1qaGptWb2YgtWSv8KonKlIg== X-Google-Smtp-Source: AGHT+IEDH3oYlpHSomqoEYgmQNrZR7BTkAXoO0dtmxf74oy92nwgZqbCKutcisVisUnIuWsmj2GC X-Received: by 2002:a2e:8807:0:b0:2df:7ac1:b27 with SMTP id 38308e7fff4ca-2e949574a91mr3894371fa.28.1716354570961; Tue, 21 May 2024 22:09:30 -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 38308e7fff4ca-2e54592160dsi71761001fa.221.2024.05.21.22.09.30; Tue, 21 May 2024 22:09:30 -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=Lbf3ntDL; 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 0C89D68D416; Wed, 22 May 2024 08:09:10 +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-db8eur05olkn2109.outbound.protection.outlook.com [40.92.89.109]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 289EC68D27C for ; Wed, 22 May 2024 08:09:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KyWi4i16Wvv45JhbrrWYvX060k+Y+1kffxgmdINLSSeetx6zyIRvHcgD2a/Kbv5r7Hv5zzQBR2H6nTCWSveipEBA0qGLU48jvn8A5ZY5dOFZkNmn6L5nAs0QHxaypbVSWNst6YTt1nkphTg5no/xFoaRLlzepOFZ5rwbHE7tB8kXIPYMvR6oGRWF94x/lh+irULXVFXEtPkItgTTMCamLJ6VxQYp3OO7c0NVDF94icNCZ+WWFTdESUd7su/9g/bSjMfLeQ7NFVKG+mTQ6aaxO2ks4lGs9d8+DJZb+H01EahZ61rIID5DOnPBF7IM5V6b6VfqaVgOcxjbBHV+nybMwg== 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=vs0enRj6xYMdC8Cd191V2CYCr3oWgeci2W3u4Otbu3A=; b=UdL/DQp3SsiXibSM5ea/9lj4ptv22NWcJAFdfg2hZfrReHHD3ln//nE3VCxxXz1k7a2sDAlgU+QvOfTJYwfLyq5FNrmP8hVZBqCt9c8FZMPr2ALAKB4I69CpxIRq21zVNd5cp2JLmrTNrSJ9CQMYj8wF+VQYS5LjYOqyKETqK6Rs9Yt6LgRxs8zH7aszCxO2YA8V2BlRqYq33IbDtO0eMxIgkvebdQEFHeiR9oVHKIZyii9YHlCYn7+ZFfvoP1DNorLvlTAPCUkeDn0zbcs62jy6TkMb+E6z7UVAVqqDsPK/zkqR3B/LxHB4S+HBvh6pQqufGKEJlCw2XRJ3ASHm4A== 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=vs0enRj6xYMdC8Cd191V2CYCr3oWgeci2W3u4Otbu3A=; b=Lbf3ntDLz/nHdFvkbqiw/SOfjixE4guLsPGVbipRVfDQTWTQpLOveFgyye+kedTO4XA0oKB6CV/oFWawFnFF/GpzAwI0YCCAgVdAtg3FU9Ev24Vf0KO3Qaubjwru7S6E0w2EBppIFSi+TF1YjKhlOHvST7cMjdzJz+tRKwNsGnO7rwyzES83SHPIu6NC4uTuUVs69bh18JrlIH1caOOulGpDxfxDcZK44z1s/jE2o/WhL4LmG7NBjfvuYGl8wpR3B6o1SB+hwlDW1HDNZzD3PPGkkYeMsO7IU+z/cPmtPH2E5T9H7Y97d2Ijyvt+cWEiK8XZU/MwYA4dWRqzi7eisw== 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:08:53 +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:08:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 May 2024 07:08:34 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [gRZF+2DtVr2CsvsD/ht9v2/7kV6huf7atBja+T+HS2k=] X-ClientProxiedBy: ZR2P278CA0081.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:65::17) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240522050834.3362672-5-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: 09e66d54-4324-48f2-24d0-08dc7a1d4603 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: 65X4xzYY4lHVxlUFcNcpZX0/XV2jj9EVOOWP4iprV8jRhTvxzR8AvJKKIriAsd2ICsrXb2LgZExd6OYvdFcIwaK3/FNTh3mWR/r1S1zZoRj4m8RGESCBgVUAnnsMXWEQoI0AbZQyIbQ/MH9H6D4NYwCbsrP8z6c8X4xiSlNgFezHgV4+vXATXVLJMQNYSPCUpFeBRMkQN9567Gj1n6iDllaP0rzpXaSHqy5NhdwzGZRDxED0XKj6eLvs4FbKUzK0BQvASXcjitmRa1+mUa34HrgRZkprWfwjHubjC6T6Qebol6TPoyOJMks7iwZGDxmdLL/og89D4nlLZfFc2W/wxgTYoWf5Dg9LDl2fRois5fUZAcB7QIg1dAqV7bERbGH3ZYWMIJiupEFmYA6jgYNg1uTiVxJAODUo6bThT1kwa6Ngff2UgaQuCQJbmUTcgJ0rVw3RRML4GAP1PoZgZSgcrKXwhIUlL1GA1PyZ/hAf7IChp9RsSuMyjSiCVjaKxvPBlz/hGHJJpIduK61BxZsvaGogZbS4sZLBiB5wD6Hi/UGjHgdG2l/H+8hSSLPZnvMPaY67CNg+uSxYToHlmsWTvJJyGTZzI6GhAw+sE8hM5Z4pqir6m7yKdYjtQgXw5xdh X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: or/dri56/qprkv7Wlfgftn6Va8h6r9gsA2W6cJ21c6T6V824rGMSh0C2ureFxAhNaG2Iu8vO3LOEkTk5ll0GInCl+VjFl5VMZxUDTAdZHaE/qT6jVIJuRnDhiqFORsE3ysJ28eD6A6iIqJIScI0sCBmT1V8DNJSo5i1BO3Ne36zTLPmKVK6/u91NixC1kz8HaETH+1YleFd9V71mf7jEVQW2AiFg1rDhlZsXOjw6/2OHdhLPg9nzk4RDxN5ypwj7xBnQsPk+4IvN9ps7/bYLWDyE0VNmJ/nWOvpSTqOG6T36aRcQbqAqei35mgPANgEUFhlJjbBwbbgzfwmcX9LuynYcb+7rPeOkRtYYVPFBF4DxRwpMBsHY9oYRhHwqwxz7GEkuddbYGHGgyMCEAloNXM7I5bfc9r2b23Hi7ZKdcyKfhk6jzUc7s7Xk/mMl6YLNACrTjoq6GSCjQ+u+tamnNMjKlw2D7CS++f+50XB8NyEhgqzjBBhZy867GfCUNGiVokIPTmB/rA63yElWyJwu6XbGX3W/aHZDGPw/5/AFzV8YxyIS2EoRtJXTgsTc1ra/ZJIQmcDTOQzhR8uSkLEyfGEHx7O1BVtiQmKVvUpZruelVx9C3Y1VyKfrIQ9+/sIpEpNP0hMgEPP16pVnDo8xl1dVikG+579U3M/yMpXK1Omr0R9d2uSYyQ09ufvR+WIe+yiCNVoSFwMNPH9/Y5aX2OUvYJTdJkVblD8kV8H9aMPA8pvb4CYe1asuhOyO/fvPy8Bbd4b3yum2cetk5J2DpdUdyy8in/HY44iEh0aM3wZrqQR4VMFaoDYtG//MTgT64HoDOzqfbY5EWeQBugFgaO/jYVXu/otT+NOF+qX/XyXfHmasW5/IBP3RW7Hc6dDSjB2/sxy0eEPiYcrnS1pyPzLpiHrsHR+K3fjht52pTeGNeZsAj/De8szUg8aHuwQuJjtCl/6+UVw4vV7/wlTPTDaXjZsLcoW3Jnshrge1PEhExMm5xjatrfsQTlO6oUmXCSkEhmv2WKiWZ90+ot8tHvhJd7k+T3h/TuQKA7lDLqSjncg92KypymIZeMJEGqRzSdysvKKfxO2/UVWuIuQO6YjdYIFbcuox8+QOcDAxJpu3rivRnjeycsjSTo7234QDKnrH6p02SSK1msUmI6+c6lOYiCPCpojjyTDodeOjgZJEN8HDqIe1k90XwTcFhhhp6on/HR3q7wEoLrEjnzpMMfZKkHSLSuL3W+SR0lCgl28stb2CR/jpB96pmCzBkgjpVHAVU80B+MiBBt+7bNl05A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 09e66d54-4324-48f2-24d0-08dc7a1d4603 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:08:52.9513 (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 6/6] avformat/dhav: Check amount 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9j0L3mmPaSjk Prevents potential use of uninitialized data in the following memcmp(). Signed-off-by: Andreas Rheinhardt --- libavformat/dhav.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/dhav.c b/libavformat/dhav.c index 8e08274e68..b2ead99609 100644 --- a/libavformat/dhav.c +++ b/libavformat/dhav.c @@ -278,7 +278,9 @@ static int dhav_read_header(AVFormatContext *s) if (ret < 0) return ret; - avio_read(s->pb, signature, sizeof(signature)); + ret = ffio_read_size(s->pb, signature, sizeof(signature)); + if (ret < 0) + return ret; if (!memcmp(signature, "DAHUA", 5)) { avio_skip(s->pb, 0x400 - 5); dhav->last_good_pos = avio_tell(s->pb);