From patchwork Mon Jul 4 15:25:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36654 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp2900678pzh; Mon, 4 Jul 2022 08:25:40 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vjTKrREDy6haYLSLIefzbGkPT4Mdnan6FNsoawi2x2uf7Yf9epCm3OXeDQziPmFRsin3Kp X-Received: by 2002:a05:6402:51d1:b0:437:a22c:60da with SMTP id r17-20020a05640251d100b00437a22c60damr40084947edd.28.1656948339845; Mon, 04 Jul 2022 08:25:39 -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 qw5-20020a1709066a0500b00722e8821ff6si23286015ejc.514.2022.07.04.08.25.39; Mon, 04 Jul 2022 08:25:39 -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=fmPc5vgt; 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 A17CC68B928; Mon, 4 Jul 2022 18:25:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2061.outbound.protection.outlook.com [40.92.90.61]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B230F68B89D for ; Mon, 4 Jul 2022 18:25:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GDjWFLKq0hxWz+pacjluFZ77SEsRPJRdpFVegxTa1pRG/NtNCYCzBgyGN+pl5QMzgB5w3s2+HwaCU04sCzSC8EWlmUsRtlf3/QIK50h/bAHapsNhooWgG6VqT6In6MPoBbTM5erptiG5BJrF/NK9/c2K/cc23nU6detFbbUOrijPupLMzLnHTKFpk6MOEAyopuQSyDlxvu7VVw1ecx2DhTJyRzX68zG3MyKsFW/qipXcUbgczYfNKAvquAEEzyIyO5FaLl5oErRSB5kMQavNbou5Xf7Yd1upJ9LdjueCUDxIQYYc8sswi9Vi6iqPgiDEIGNaswhJDTW06Dlb6izswA== 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=Iems8uhJEOTfgyrQLWgUsTsDXNhYvKRM9Q9+dD10eUQ=; b=EZei+ztU/kAxytMoNDEShm/XCUOmixvCrMcmoHsMrElQUNjLLpoYSPYAVfQOetTvwc8mgJHe/QVlrx6veWuOtviVBuBR66wweK8qo4gBMME/tLJsTvuWbngJhQbDM8VoqXMuFC1P4MTwILIDYcbVRSYpPt+eCoscSYqNqqbbAzjr0rfspiwUABAMuDEEdx7J1zBATU1N4yoLqH2USgV4L+o4e/4jEaF12WFd6krIejKKNNMgDpS61iXP5PVqGh1fRF96IB78UKfoLZVOuIygEJakXqv/0Mn7p8YTMuVt/6e3zSkdZWnE9mhPfummZbvT9/7hQkZXk0fvaZ4p5910jw== 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=Iems8uhJEOTfgyrQLWgUsTsDXNhYvKRM9Q9+dD10eUQ=; b=fmPc5vgtX/27SCdD03ypNLyOJcIr6SHANViv39zyshEh4uJTVuER9XiOBwcH1iDcwTyM2cUKWdGAi1hTC1U8i5bXCl/rzAst9BqM34AGpq8obocMyay3xSW3hqbdi6UdixBNUfPEJOcfrOi18chtg53EVGDY5teHytjaC7FCg8Q5Vr6NXKTt/TznFxTsbjVJK/p8Zd6Pya7KIkRclyOyjBaqymj9fxLeYugp29aN/x3GQPJp9zFAwO18N0cLEpLEMzEmAv3djnv8NDiDT7oBDrfsp6/4+kBg00DQtLlQ2g4Fdlu0bnx3ZF69/FGpc1Wt7LJ1L4ZWwIIx8T1+5nEM+Q== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by PAXPR01MB8566.eurprd01.prod.exchangelabs.com (2603:10a6:102:22d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.15; Mon, 4 Jul 2022 15:25:28 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5395.020; Mon, 4 Jul 2022 15:25:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Jul 2022 17:25:17 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [kOFTn7dTBvWO1ZtJaZg7XQ1SBioLIhE+] X-ClientProxiedBy: AS9P251CA0017.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:50f::22) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220704152520.1106645-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f19f27cc-2282-4c04-b05c-08da5dd16cd7 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUxDAI+Tg+jRSc79YAuptYJphSvOU69MyaXYC8wXq3+5PDVv95amAFyYseb6hl9S2466snpMognldFYO3Q4JTznoXlDAKv2ng3YTO08kDGr0eXaB14L7YobPIXWclksjngvunXGxuXkQjm90bUhBSkBws6868xFU3dYIj4FON5u6OPy7iHz8+26juZxl9Hf5LlxGlSV86jJ6MSQzwUzhwCntfD5r62zJx6ft7kK4RlL2mNV22DFcTNwll5BK9FS5LxPs/YPiMoIDLHaO313vEyOSeLL6Jo84vo/FVp9jx25bpN8rFwkfvthLs8b1mYwsiqmqHEeo+DcteLqkaI15Lgxl665fV2AgoonywAt58YZZlEbwZquAEvRpuJetIxv9/OQtr1rWtI3x3eQ+WAIjnh+VgBxoLwAhDv+XPaAflKNCi5xsJbvX7UGO9yywayRWBdB+8mtjQ9odQXIdDfl2/+x7jDkz9SXa6SqHoVNH6h/QjbVLtvorYSIjs21+zkkU+qKcBAI9t2w4CDvsZnLWc+d8/92PhEnETss91q1w7XCmmOQXRpocYr5vaYhTinFBDNNo61cHp6co59PjUALq2QR7tPHQaS5JZ+mpeL1sOXvHhgsXArsh9dIxG4IMoXgE9CGHFkguXHXEfFCFKdKf2tmLpLt1yWbok3iyS8PDSb3CxEE2/kKiJG9YWtvDBOAfI8kqb4Q46cQKxdBnlSlmFOplmwEqqE6JiY= X-MS-TrafficTypeDiagnostic: PAXPR01MB8566:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: omIORhSOW7i/oAP1vllgV/299TXfg3QckhhrO6eADQUOj0D6X400UFIyAkmcXkdxc8X2Uh3UwoQ6wgGXUnEf6vW/3LBK24jZINlJPsfzbV/pwXMIJysMRnVJc2LdOMhfIwd7cmc5wc1Gp/xsdOVaFDWSwoFO+NyuGpW7TxDmP7puOPrmlNv0wX3aLcJbxLnq+Aac8As5p43RxK6JyJTGfwU6ke5mtrpDaIQ77WyWqSCUgqvXMuRGM2GnZL2WAb/qoULxyU9TnJTYZMe3QoJ5aKqaLJoy1OQ20mjXN5l/2kJrT67l99h7FC9dIBDqkq+gflqqsq+oLgVfQNukbSqZSGmNtp1Xr6r/qsOyIOm4LDRBWTigIc1r5HST6jWpp6FPuQu8zX3S4WzcZLJkS5CrqeVgbo/p2us8Lkxz0T21J6cP346RZ/pku4+21fi0qeb7R+RMcr+5WA2v+TwrCYC1uPn21HlM/zLsaw5OUEvvTuMiV5udCEUEczDrNcTt+qAT2Frvk61ZwiMIsstcnuvSfq6CGFF90E9bpp3De6vunohCfjBtugHP4ZCcpYhTpp0curot6KAIakzg2h67jT/Vp4jO+oS1knB/n4QuwLuar4mhlSX8IS7DKU6Dww5FNisJrB/d1FsceMpAmDGvKImMkg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: B+vt25TJMx1XaaIHbUc7xbo6j257aVguKemX67wCCwVfiqhaDTLLanp6vRr/b9MJV6DolpL86NdZ4WZQapTQ2aeL5LGe3j4aa1+huwT4iMFLtkELUl9HVh7RUDRDA9gcXVs4ZSZ77tz7bDC9Eg4eJR5/1/SJcvYIitrTble2XnD5O/PQ3NKqjrAJfjDBXoKVnY04sEM9jO7oCwwk6apN63FhsYbmC0+ApBhcYJTys5c0p21G02SC9FhtY6CLw054tJHmN0QQC1+xHu1E7qUv5hdT6rhDVzNeyM4qiLI5OpRBu0gyOc8NqS3MQ83McJ8XzaTu/OTX8cdGsGiPrAEHaZgawqGuhuR21IhtN0972kcMA0jgLj5jptoiV7IojXD4DWyZvHCfA5lTGlALFQc04oH1GsvsyTR4pDzUqI5tRBQA8I5FEtFjm/0atGgaEWLvCJ1p1locL/BbSS6L9Qr6+7sqdnLhP11kzF/CvkO/kh/m43Un48cYRMVpV/5KYX52q3WbrQQYj+G9w6LBL45zqGtGvoDtknuL57j3ASusjiBDsWNpsTdHCpDag3NEWn2axmLwgj9VjtGVQXmOFJFBB4FhQFCBQ5tqzgGyWXkLZ1wdFG/YxROz4QdfsSlQMO4JkVbWcBk9CFuUhugprhfAw9BlILnacfq5KTzNofLJvGFP8hsmmiNPGsP+arImRbeMPD7R0t2+G5O2UQN6gGYWxS09T1JQ7/WkayzmKRFnJj8ayt6sv0IwQwC7YEG2yC3+DP5NfmLwc4jG8uAoM3xJvilMXSaVV8pFzl0cySOy+OZ7L2gKZRL6WjpeUiBEPQ/PQLDg+aasdyc+GykY75J41/gb6HGRW6VVPSLBpsXdYHI+lnmfaWq60YtdZtv2YvCZ+NN5p7pznoRoVuBLxIVPklGBDMyko/vWw5jUuDZovUhfdBAS6tXUM7uJOTZ9Zb+/tXWTmYyZd8G9K1Ms6XaI6Hw68zu9MVYioY3cwcapBNLJmq0YGdyB9VWDsqNPKsQDKrUFYzoBtKN5cs7ivAikADE7qn8HY7hokJrvi2htYHRXMtTEtpeKeSt5mefqQVJxPJUXO2KJj/eswCr1Q6IH/8WJ/IBHdrBWjBrpK3dL8icJkvcw6UWRIYRtTLfndCvauRmoDcn/0RLXFW5LoNvI5KYO9u4ituYGdGsKZ6LBnldUHQexb0k6OQZeldBp4D3EqXDdYN0m3LIlwjkkwCBOP55Js3fH4A+U6DSc3Q7VU2XRbqSEov2kCW9alS2QzM6nPWoWD04caQ3tVzi0hhETN60ZPlhXFENNIapmgcXs4XM= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f19f27cc-2282-4c04-b05c-08da5dd16cd7 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2022 15:25:28.5487 (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: PAXPR01MB8566 Subject: [FFmpeg-devel] [PATCH 2/5] avformat/apngenc: Check for incomplete chunks 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: HpPK/ZB721gI Signed-off-by: Andreas Rheinhardt --- libavformat/apngenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/apngenc.c b/libavformat/apngenc.c index 88d4a41462..7443c77504 100644 --- a/libavformat/apngenc.c +++ b/libavformat/apngenc.c @@ -50,7 +50,7 @@ typedef struct APNGMuxContext { static uint8_t *apng_find_chunk(uint32_t tag, uint8_t *buf, size_t length) { size_t b; - for (b = 0; b < length; b += AV_RB32(buf + b) + 12) + for (b = 0; AV_RB32(buf + b) + 12ULL <= length - b; b += AV_RB32(buf + b) + 12ULL) if (AV_RB32(&buf[b + 4]) == tag) return &buf[b]; return NULL;