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