From patchwork Tue Mar 22 23:09:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34913 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp764186uaj; Tue, 22 Mar 2022 16:09:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzkrHbqnaXsBy9q5qxbG9UfZJPGxm8jsIunTCEdsXdNeARJwDOZj+qIJ50Y1Mkg0r0r0YM5 X-Received: by 2002:a17:907:2ce3:b0:6df:d2cf:4d98 with SMTP id hz3-20020a1709072ce300b006dfd2cf4d98mr19009440ejc.139.1647990579900; Tue, 22 Mar 2022 16:09: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 1-20020a17090600c100b006df7df025b5si11237330eji.6.2022.03.22.16.09.39; Tue, 22 Mar 2022 16:09: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=KDy9EqGV; 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 7518E68AA6A; Wed, 23 Mar 2022 01:09:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066052.outbound.protection.outlook.com [40.92.66.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 06A2668AA6A for ; Wed, 23 Mar 2022 01:09:27 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BJpGkkZpTJYbmNamwOyAMUtvEMz59g2mRjLXJAQUuFtA/9Kc30qZJgpY+htbrl6O4netwkPWn09awPawyP/Qe1xtfL4dlZFXE04QgqKu52NimHadeNnueTEfeeLJfkRAUqrjTNyqfGgniC4adO0LJFBa42YDR7oVluNogp7gpiIrUlP4EJ18Ksa5XxJNyQtTn2H1PGAIUdf6WMAixTu0Oy5maOM95/rNHNb25b/OfmUAQVfxKuZJTJsdrqkto7OfG+rT8u4Hs5m50ZwpTyrhXIRv4mhqqRZxNFnajyidCzI2sPguGJ/bqrfgFpEHyQqCp31sm9OAipkgkM0RM62P/w== 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=CzTI5BMjYlcmv83B64bMUZ50d2BQfUi7bzg+qGskyuY=; b=VVgiPRtPgu11P3mNmuit20ZB1D3p3CiVlooTPIuqF1Gz4f3rPI1P7NZh8JQJc5oCKBX58VLJOGns3WWHmYAOOmrhwppUdkt0pFTzE4zRj74F8mi5H0X0oPJB8/hJ5V2Ad3NLXe1aF0mYZwf5nCleQJzzFF3CiDtBiQPbxCZCTjg8xz4W68szAKJU4GP8MzdkjyNyL73wVBfmaAuEbTqua7uTNkZ+Sk1GEK6/WaEbEXrjuFVGsmpkXvxtLb5B7Y8wbqAQirU1h+w1dVGY/vLP3YDm8+z7xDn6ixB8fvtb3teSpJz7p3lhTHMlDhmgvuytDnvmqckqNpcyOO3FRjNVxA== 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=CzTI5BMjYlcmv83B64bMUZ50d2BQfUi7bzg+qGskyuY=; b=KDy9EqGVT81KZ7CiI5mAoG85szGOSIYn2WnP365/gxCvVKbBcl32lz85eiKdPmAn3bMxFZpCPLlzjeUb546PPdjU0wkD78WsLLEStj+RylRdQ1/McnKP23hVzGHzl+uimIKAtDSfqaJ+JCOl939vuI60Ckr5XtpiDWuyuvtl059w0Q+4GLw7jL2sv231dBhtRXgEOLSaoAUKDTIm1PWU8BUB2ZNwrJ0mR3fU5W8V9lgwH4cCsi1j1U4hrTIyA0nkYrs9KG24Q3PZrZjV6qQM4s1iREjlIbUZTkkKjwmDG3ybf9NCpB96aDrSZpMhMrpy31IZ92xPltMYuPqqALm9Ew== Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) by AM0PR01MB4468.eurprd01.prod.exchangelabs.com (2603:10a6:208:f4::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.17; Tue, 22 Mar 2022 23:09:24 +0000 Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8]) by AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8%3]) with mapi id 15.20.5081.022; Tue, 22 Mar 2022 23:09:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Mar 2022 00:09:11 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [0LCiwEB2Cp+dE4dpPv5UAkwHHaqD4XKq] X-ClientProxiedBy: AM6P195CA0066.EURP195.PROD.OUTLOOK.COM (2603:10a6:209:87::43) To AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) X-Microsoft-Original-Message-ID: <20220322230912.466724-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 42d3eb62-c484-4e44-4230-08da0c590199 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTYoa8NShfDu+flR/LTYW/b299zjd+KaFjxP9CdBmZ3CvKiRvsKIIzK59kouyLKSQ5h5Chv9b47i+M84+Da7LsMtlXhNxD7Xl8DIaRh5h3wQCO6zvMA2Dc7s9xAjhhUzmEGxjyVyeFQDqNRkagfD2FWABcSlvrBiyePZfBGlsGM1DBLRbnDGaq5cRpqaB4a0KGmwHdIUO+9Hmir/c7bUE2F0HZ/LYTETn5RJD1qlbJvAWamptYzmU6Y4RYCz+SL+0mqLFL0EARrUjTtcr/67YWWN1C3kF6OahgDcR0DuPA/XivwNyB5ICEkvG17WZ48zgOsWUvor4l7h4+iu98VXplL/X4WbrqzjnXOb/cUTV8Nub0h8ltVkrFdpF0B5p7og9qHoQXs2UUjpPhdTIW5/FdydlXS51Rde+VbXM3dHjV+zVMYFvUucJsEIiZ+svP//zJFJgzibBzZEj1ciR1jP8jpi2x7G9dkpODYjiDurCmmsyj7oRN8H0MgEMJFxHTrF1AX+chHNOWVfVV18CGnvU7OuKgmTP83CW6JMSD8oB6ceHK4yAUlGIYkW7I4VM3nWtEmsOD+CLiNZ1N3/Qwu+Sprx7Z3tpgGMV5U1f63sAkDxazDTXCYkPgr155/ePX/JDd8AcMu/2VNo9zwksN8EbgPONVZP8XSi3p5S3vC9R8+75mwExycrw/EpPE6JcdmBPKmcrBowuk5flpG+fXFHyqQfn9oOyAaOPjykDBdIgMbzdi80CZOkks30KtaTPXoO5k= X-MS-TrafficTypeDiagnostic: AM0PR01MB4468:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cLf/zFNuGDszq6SxaeNxJCYCi+Nyy+VXuyC5wE7+Ai/wwL71/veCYUzGZyJ5oaOpyXc5vqIymRSAVKU+jtEQ4o+AZBL4h1r4ZGVoKQ1MFp/9mohB5ZCRWV51fLCssGRu+tDsp/Qkcz7Kv4KRrQqsmpLya9orNyKU/DSIi43R/lNbUOI68YVPPguO1Rj/xZRmZ+05mNTbSwvtCwAVpg6gQiknQvmRnAaHbLvtSHPZGoQ/H9W59JwYb3O/+vYLwXSNFXBJQoi+kplIQkoswBjx+6iYaNzvEwalSM8XWssXKugXQVcrQM785Xn71iJyHedwZya07HxJUuyD0L7uy/y8a6ai7WTzZ9ugdY0+MnnHQacP3dZ+3gh8+Cr/JFv7z9KiBaxS75fmhsMKJ7nAVBZjXiWaKa5Bkxozd3b+dqBeR6GX7QqOEoQcvltclJwezJCNjLpK/lf88f0uiBfeIE6CuIYsksy9EqhHcthF/RXy2lwjYjzLPWo7AW+4Jwy3yavSx82p9DLXbmrs+KHQSFPuIImPeShfnPhIDUu9k5JNXlxQLmDM9AgyqJcjOQNtedhyN8jco2bexd6G1mFmDxTLoA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LEdjAHukjO+ZegeiIO79WgSkXGjQ7BiLbe/McdPYALzx7aWipY/lczk+WN5E253cZJcFhKIFZFVq8nN8N8yaTtk8IHsZVqMtzCLVD+ZzWMTMYY4xiYmEkJBXEWQwtJPD3aGL0f52utFdWl98ObzmAoCSDGfkih8dTSOU4Nf1IGSyobgGNYCpO9azT+vqQoDPUerKK8IdxxiIrbwpPg8r0xLTZzYr/93mBTQdq1uPJkR1lzxKt/V5/27rVaeBTjtiz3xg1x1O02Q4e1+dPpAUrPWCQMTlgAGwCzwTxkf1Yaa9TFwz4mBPCOvfZAjYnPWstdxof2e+E/hur2WKNMKNlYwk5TiWHnFDqTa8gFFXgcQWxXNOPGJ7+aaZKIEGyQB+TKt0A21xL77T4tPpmJv0bXds/+56ayVQsQ7iLakMHw+SnVA4txyyL5TikMj33xakiHG7MiOyoz8EQK8Kom6O65wpgTlwyuk8EYqgN4JL+b2oqI4nvt2diglVP7N3/MNWsq19ABnlH1FvgbBYqGH78UM8/bY/y5DfX2AFd+uaI9Znbwf5HCu5E56wqujbYLly0ncOXZK8L7lzWuCj+MQ44c/iWrk6KaoHrXqQI3xMPtO6jKZXsnjvS6n23D17+ULvDmwof/JziU6Oj+9a5w+tp086fA0Cb9tCYWowLISBlsXTBiDffXQuCH44jVQ0VyLFam8o14HWYPQDrLIMUEUGLQj5ljW5d4R0orW+zdLtsxzUkq7nBqh25MrTRkVwlQC2O9n0baG9VZYkhKa1vV6icwuf/bgqvKXj9xzPkH9bLSCzRc9tO7dJHJXbSCs10VRbVAvt+BOMyUKQEuEwwg6pXUEXlVJmVku5tMjZo+2qpF2mM6ysL/WBRECYyOnT6po2Y1Py40xwWbp7iNdzTrROwioH5VPv7coZFqw8QhsfdMjfnFNGXOFuj/kaQU0tjmnCyMx04VMxqX6Sncq6HavF3erN/X5GuVS2bfEB4bJE4odQE2eNdbt5rOySdQWuXCV95NYCJmggGhzVkq/qFbIEnDHDBEXsWF20YUSk3beZTeLBZnW+dt7fp1o977eDMrrAvKSnkgkS8TnRCDLe1it/4GD/V63RSLqES8lNEfQeGY2RGiRdvxtuzd/iERgEMK6Swgffo3+Y4oJUg+/aXp9jVf9RIcdrwA04tRnEAIccJ04= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 42d3eb62-c484-4e44-4230-08da0c590199 X-MS-Exchange-CrossTenant-AuthSource: AS1PR01MB9564.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2022 23:09:24.6821 (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: AM0PR01MB4468 Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/vp9_superframe_split_bsf: Discard invalid zero-sized frames 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: hIxYS0DMjHm8 They are invalid in VP9. If any of the frames inside a superframe had a size of zero, the code would either read into the next frame or into the superframe index; so check for the length to stop this. Signed-off-by: Andreas Rheinhardt --- Now split into a patch of its own. libavcodec/vp9_superframe_split_bsf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vp9_superframe_split_bsf.c b/libavcodec/vp9_superframe_split_bsf.c index ed0444561a..7f0cad1ea0 100644 --- a/libavcodec/vp9_superframe_split_bsf.c +++ b/libavcodec/vp9_superframe_split_bsf.c @@ -70,7 +70,7 @@ static int vp9_superframe_split_filter(AVBSFContext *ctx, AVPacket *out) frame_size |= bytestream2_get_byte(&bc) << (j * 8); total_size += frame_size; - if (frame_size < 0 || total_size > in->size - idx_size) { + if (frame_size <= 0 || total_size > in->size - idx_size) { av_log(ctx, AV_LOG_ERROR, "Invalid frame size in a superframe: %d\n", frame_size); ret = AVERROR(EINVAL);