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