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)) {