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;