From patchwork Mon Jul 4 15:25:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36655 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp2900748pzh; Mon, 4 Jul 2022 08:25:47 -0700 (PDT) X-Google-Smtp-Source: AGRyM1szTn7qXH7Dvg1x5b2SZ3kCZFZUoxTAn4w9d3NR7MvU38a1zM9UvcYdyYt2VwVwszt2gpaU X-Received: by 2002:a05:6402:354d:b0:435:93f9:fc0b with SMTP id f13-20020a056402354d00b0043593f9fc0bmr38828948edd.288.1656948347322; Mon, 04 Jul 2022 08:25:47 -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 y1-20020a056402358100b004359f471717si12227042edc.0.2022.07.04.08.25.46; Mon, 04 Jul 2022 08:25:47 -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=HlKQdhsh; 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 8EF4668B935; Mon, 4 Jul 2022 18:25:42 +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 CC18368B917 for ; Mon, 4 Jul 2022 18:25:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S8+OT+/sJN+ZoUubwJl7EiAaDeYLO/Zwz0ahvN7R+PjbjblMIrypf/3xWfw8N51uJULooNva/LrIkvfmEAJ1zDcfBkYgQRYG07nikQEmuUffA+yimFGHBKax88O9u6GKnlEZFbwIwho4sZM3V4RJDwT/opfFVrFCfiofM4XNOZREXz8Nt2i08XJxpO0bHqV2EhB81Q1zBJLcdBlwxRYuhJ4LhiVxtKQdIOUtGXpUp6toXC4YKD9Kbg/pc5xBPAtxUJBk0w812jTOHVzK7BUwa4ExAO9IWLYPTBDXwaElg3aKnr7qFl1l0QpF3K0gHtqFgvk1m4/dgiiItB1K3qCHoQ== 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=ogUGnk/3qx61E5kde2AxLyY3HZIPSl6W3MfzEwUampM=; b=O8Jm9qwCIEeSLvdgC6FgLNmfDWI+i5o48vvgtrlFZe4qAlEye/JnA/WeXMEC70od83Z+d166CZHwqad8buk/AhvjyXz7IfbGYBOqlwsovVzzT41CBX1Y2WJ2Z9fzfcllm7iSidUBUv/Ed4F+JV9VciYQB6A8pq+OFvqEKRh2Ecp1VMeAjoIGsPvKeKMzKuVcTaA0ovgwWvJ0NCKyFSzohda3srKUyV1nQ5/Dvy91ccIPUtefa3Jip46i6UqDwGMh2ai1ftRyeZRAXTK55ZkJl1/9HmwXSmzBue36y1XfcNN9n9p0oyGvH2EekUESiuTAJUEWVLrOiF8sGetb05OCdw== 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=ogUGnk/3qx61E5kde2AxLyY3HZIPSl6W3MfzEwUampM=; b=HlKQdhsh4iNWfXcIc7fPQ32qvC06SRRa2fIwp5kFLSaTQ4mnWwfDnzGU1H72On6sHrLKGb9rZiNnso3QvHBdEJFzpJfouhCP1A1qdGsiCkCT8SfFauberL2qMeWO3RvS166MHGGrlfojRhPCgvgFu8PlVlAgvzJ+oW4kJ2X0jiJbTe0SFMK2ym/LklIHxrGY6VZfAHzW35qGLVrehiUjplYUcKZ6TLI+RIIVM268aMcSJy35lfDDR67RW1lkAMjvYxbb7pxN6Ch1P51y8Wb9nkaDMzDDHFt2qoqM6hTG25oI7E42ySLfUMO9r7IdB9nBsvRZ0LLf0MX/4P72lQThoA== 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:29 +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:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Jul 2022 17:25:18 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [bSVOtzY7JpXqXykcqkxqCtQJ8QzBtJHV] 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-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1e58cbe4-9181-406b-4296-08da5dd16db1 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSUs0MpKjnPJCEF4AMFZodnTMwQqP31dFuhX2CQAblAb9MoX39eIqt29SSRraJU+JOSipw/NBdTxE7bIulwJUxsrRQTyL2mUc6oyLZ07gWyNUBu5oLVNIg106Nr4CVTPh8rWsLBB+nmVBiPm2nUKNtwsAMdevG7mdHcswH2yiWjM1g6Mby0RirFb6Jl8XdEKT3/NjZrQQ1YRHokMvz+wSbfGPaosixEH1xhS5T6qYV/dTl45apXkj5Sqp1TpZRHHCGZmmZOh0Wdg7D+AmYMIYPV5oDhbmDzv1HX9V7DdLCnYXjI3RDnMpAFXyP3zaCEnvMEZOLTpdl9DHc+ipQnfaLGvLPJCkqDsesCbR3EkLjj1WQzn6LbdYqMJR33UZYGU5wD3J+HVn92ksqQG8CifMsWchwoKGYBe+idyucAKamJypF8Zz7OrtAN64zGBYyfT8xspOeWKRwG48s9Yn8w7l1MzrmePnVoIHCMXe5pn0f/P5hHOiavbyYz7ZM2yLv+rWEtBYIDjJ/yBEtGwCsTrz/ejFCDbPxCUAg4JJDIocBFX8kZBmSwiUBgVe7hALqrfVbSowf92+dM03qP1b4QQVkkQvOXveRk5yaE5w6mK7qDHCDllz0vaJ9aWR+AtDVnyFjskKxvkqvGF4OOeB36zH9huRHKyZzTzT7wBQxoVadaOi8OP2/BXmfpUyQhuNfzHNsO8Ubi9W9by368BoBSdexvl6d1rCZk8uxEUnbE3XhSu1mcDjb0kcBsplD5f8U5D6s= X-MS-TrafficTypeDiagnostic: PAXPR01MB8566:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: itqW23/sBbycxQS6eIQZkCwzB2VTJyEnU+fLn8CrkcCVY1iFYjg7qRen0++tFL5YgOR9JHpwV9KeSUjhFdb1zbJAX4FUkdGxbYlrcyRIDZ+V7OWZ8WKdRS1q1OnsuTD8B6PcxfzyWMiiVsx0zY2A8GNtqxSz5LS5X/n/iReRrHqIn6Kd87lAMUhePrYh7cWmlI8teutwVLPvAA9NclcSAl/vrHWiBODc75TbV8FtFE3OQzoTv0m471PJQmEqwveCTtbjZMlKzWpf4LRFHnZJDiqadicTlVHJ1BPf0ysmtlA1fmWyjBn4ypboqRq8LH9R2/9KdMG5CV0VZRJGUOF9OqDhkWkZIm/+XRig8rckjc36f3E+CzX+pbAkMyVVoAmwYWQQF3uDUHCKcFCTVF1A8Bq2SMrfiMkWEyg6KIt7ONCcq/egNO65ciRvalmj7jX72bfJiPHq13NStAfn9nP+hjlmwrij3eWAymp+7VAqY7aARwWcov1Bt+0XlL8+cbOzrHYREMAL+zhvw6d17Lxuv3JssoN9pyQoZCGfAseuPcvVL0cgsSLfFqewXaTXLAIjyifzM+qWNM9Yb5P5YyShBTHVXkDluLwEH3uLixml4ilU3DNw8UC9VnypUHaxMXo7aQTOppSaEuKZlfjyJh3jCQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IFGqrcUlDhUlHgs+IKAnN0hBjhgIK6AStfiU4cNTVGHGn3nxaMwKBd1cKqjeTptOSRCSqxinEh2JE2NwgH1EI/pWXiR4dSkfouLAQ4RO4iNlhKXLetcZYu4Yag3vTzWHVU01U4IiZzpYwN8HWo3ogwirafs9pzf6V0azoL3YWphiP2ObTKlDtnTjZWYKY4a+WtQQTvJHRZGC2exDNijdCjssfeo+75UBOCXk/EZJ26JtUAlOTylm3VWre1AaxswTCp9VZO18DbMGzva+iEtHMlZc1wFPpQwRJhGVjxw9/OGWOjUP5li+fwDto6WbzN/KrxF3eXh4gJj4Rmp/hZ1VLKsr423xWFSdsfaL/JMpdU8lFlz3c64QQewGJMym489CTaarXCJUbDAYp7Mrua85hOnVybVe172OL7/rfMjWaUQuNGqkIsBaAnP/FLG11RSPSh9slU1WSRa+xsAzRthIteVawgOTzdGnq9/Gp5p/y7hVOT22f+xN+HJgA/hvsgBlNbQhaWwG07oI0Xc0N4tevNMTOAvAciSN5I+nDE8MoYUaA0sKMOdh4wC9X/PRDghWInAfE6BQYEmJ2l6kY7aS1I70vih4WxAY7T2eSHvuyQx+oiCfCioyJF2/l2tJnVns2iWdskKO+l674/RmTrGm+/++xJ+aYIdgcrcc6FjU5XUyt2OG3Uy1tXylq7beijwQE4OVtI530ZbYA3qL8vZht2hSmMfuRu/v4nJPvWVE79Gx+5xi2XD0tMRSvg/fWVBXVFZllA4LR5tewVsU2VHTD048Buk59aKVr0GR4kmKP67IJriwPoJYdVGEqX8FLV10iwpkK4TPfZHC+YT3fxL7MDH4LOJvUgFnmldW9yIbBEl0n9zSfCRXFKVrMgdJudtS0f9VEX0JAoUZdjNhrMBLhc0BWToB9fZxl3vfTN8OcrszZco4b0s1Ncb6EIB9KASQ90Ov4cfetzzB7276gC8XGsXbGlT2V5MQU0k9uP3TvXKgJeXH/lBjNPwALOgw6Xf9h9R39vUwPhVFgSHLrNq4CdHngjYUbNriQZRVZXT5llZ2NeOctEoKDMgNQS06IQ0DpWFXbumw3KGA5kxQis2/trGR7DBn3+TKXz6YkHpY1BKxEoKWxb+9zHaoyVS6YQlP8+6h83BGBT9n4vXn1yMiZT9H6MCLywFHOBz3r8UB0fFL424ga23tOGK8Rxps6hxSI7hlPQYHpa6SBInxtxJLYM4scedmhppYCPmOjQnL2aiq8Vx0YZItGVGEoB9q2jDQaDKU60yn66Z6R4kGNmn962EZqisghzDUUfoc6TFpfFA= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1e58cbe4-9181-406b-4296-08da5dd16db1 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:29.9121 (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 3/5] avformat/apngenc: Check fcTL size 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: kXJtv9YNdBoA The remaining code relies on it having the value it should have. Signed-off-by: Andreas Rheinhardt --- libavformat/apngenc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/apngenc.c b/libavformat/apngenc.c index 7443c77504..1c039685f2 100644 --- a/libavformat/apngenc.c +++ b/libavformat/apngenc.c @@ -27,6 +27,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/log.h" #include "libavutil/opt.h" +#include "libavcodec/apng.h" #include "libavcodec/png.h" typedef struct APNGMuxContext { @@ -181,6 +182,9 @@ static int flush_packet(AVFormatContext *format_context, AVPacket *packet) if (existing_fcTL_chunk) { AVRational delay; + if (AV_RB32(existing_fcTL_chunk) != APNG_FCTL_CHUNK_SIZE) + return AVERROR_INVALIDDATA; + existing_fcTL_chunk += 8; delay.num = AV_RB16(existing_fcTL_chunk + 20); delay.den = AV_RB16(existing_fcTL_chunk + 22);