From patchwork Mon Jul 8 17:09:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 50411 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp5920589vqv; Mon, 8 Jul 2024 10:10:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV42lMmpD6C3mHWMMDe6qbomaIRh6mh0itCv0jS2Ta0SdSbEJEsJBRF5Q3Fm7NDXtTuWOFuTSdES0JY3CuDba7kqkbIV+5/NJteoQ== X-Google-Smtp-Source: AGHT+IFpyoz3fgBBqGcQkNTFa+cbZBRcMgp1BRfC8/kZ0HCC2DPSwRZuVra+FCYwveox4JDWPd6K X-Received: by 2002:a2e:b0c3:0:b0:2ee:6062:b559 with SMTP id 38308e7fff4ca-2eeb30ba0d7mr2666111fa.8.1720458606670; Mon, 08 Jul 2024 10:10:06 -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-2eeb349efbbsi274881fa.481.2024.07.08.10.10.06; Mon, 08 Jul 2024 10:10:06 -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=mMmS6WwZ; 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 23A3F68DC8B; Mon, 8 Jul 2024 20:10:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2109.outbound.protection.outlook.com [40.92.59.109]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 87E7668DB4E for ; Mon, 8 Jul 2024 20:09:56 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iimXSQ26jkn4QpDxxCjjdM/AoCv+DJIfuSGWdLSs/vcrkt46KS1Hf7G6IrK2Ppr8HkO5KBk2HzV1jma3ShQcx9tdLIZYXkrbZluU476Ftn8FPKV3yBv291K0f9WB2+xkYPJCSPVw4YtUAeyBrBaiE65VManLGb1/yp5rDntf4LrCpzGdHxEA9v5wF4ovDfX9+LHdBfsBCPTQqxswhDj3pEMfWxxkAedcImmTffW4LdcStg4tua8la2wEjlz56jC2lUYm9PToLHDs/jnLIVP3InNTyfy3zvEn8ZaneVnTlc/8xIyrAvsGFr3VPhurHDIWxFqJOlOJH/+QF4xgUSgN0w== 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=0fxME9OLO2uQtFr52DCqjcHEctagCFn85uT/bacOFrc=; b=LiYUXySH2F7k3ootUfFBCP6LBpqG4tMclXJoFXUpdngCWBF2HCgOQP0iAWs3TnYGyKCF2dJLdYbCqp5M5ZF5WFzOJTdEhLMLz7OVffvBiBYx5wqcCHdPPnSxy923sky0rSJnnmqq/590DPrMhSUfnKaiUmckdRjTW/L4pl3y6rXCKRjNYUPg6NoJLoCWU8/ZNiM1C6PgRieLwjU5NH5zplSFQYsHw2umcPsrOv0dus5zudiLhfZ+MyFoydRj1sXi9xNkfOijFtCJic+hXlGVpnYEsb/oJvFAe/yESULu5NNoLSkRE9wx1PVHVI1affkdqCU9xRD+LBrDyLUOTeEEKQ== 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=0fxME9OLO2uQtFr52DCqjcHEctagCFn85uT/bacOFrc=; b=mMmS6WwZO2Vvkb6XDJhPGkwnzgwTzEoTPKkkSO8Y3U85ei2pBY+CwEQ2Ze/bImPgEWeunhB9Lcishm8z6RqXl20WIUBdH68qSrs9MiohS/mdALLLp/sLBVjY2CJP7T7wJpx6kF5FfSzmwMpsjuPj8F/7eE+s9wISJo2OwCCj03CAwZlRduMaNrTjSC2sBGk6+6guHb3MriIuBfJoB0zNAOTjEZS091GEeDeqUG18PkDd6b9NpuP6UTwtaAf/F5hzkRKp4S+j07FqzslGLjuq9YyVY1j91WVUfRMmrBArKBOT7dCkE/FMKOOcPgyLW3As3pCM59r0sIjuGxc7IxCi5w== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0181.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:324::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Mon, 8 Jul 2024 17:09:55 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7741.033; Mon, 8 Jul 2024 17:09:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Jul 2024 19:09:47 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [ehQkkrWgUaHEsNeo7hk1v8hqn0XVO9KwNs4m6MsMNDI=] X-ClientProxiedBy: ZR0P278CA0053.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::22) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240708170947.565760-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0181:EE_ X-MS-Office365-Filtering-Correlation-Id: 2d573388-0b8a-4586-253a-08dc9f70c9a3 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|8060799006|19110799003|440099028|3412199025|1710799026; X-Microsoft-Antispam-Message-Info: wPHJLMbTFpsZBoYDNRHn5aLSk0tueYsIq15fOuETcVRmANI3AyhxWhvbHttTA1z9QDaJQo1XrBSFlVudgSfELq0at9jMi7c1O8Hfr92Fs5hXoDav+WPCOqtlIDweKF5LjQrt43uiQK0zLn2qMT2gYV5HPZxyhMhlO9qHa1arwI/KHFn0jGETvEnF6PfnUfGrJpL2zr04tAHuFhGjaYUfL5nAPsXsIsXtUh4saX1qMNfeXPiYa8mo4x42/mW/VHnTxUa2KzQ+GMPhvT/jjtSHvOfoI11lop3QR1dmi54ssbGjSd8rUkmDwa1JoCfjVgDAUndl832EiBvLKnmndVLZLZhg7y2EsE0PQDjMvw99rk2AfmAvO/ifO6oUDqVxbFnMvcS9Sab4BbcJXFIlYJdW9grYtGJKif3jsUSc3+Lg6Eh8lICBe2T2L+ckpWHaODVnIy8P46tmxX2a38hT9NFh5GAqyXrOuOD4F7ORgn/1TWAN8lMQ4jfSvBzIGKFI8mcpVrJq2gxdMe22se9Km3eIWiC5xWGMtnE5jH7w85LMWTTWMhgVXBB64Mt0wf3PUPTZTJHX0UeI8GUuW4cXCNkKb0HjYm3AEA3NgGFDEWk2939tVXvvvgTspwCrjy7gGUvmwg3sGRO0YqMyGNZG/27ROj41JTRqMyUvHdYOrKrZvP82Wt93uo9YjsW/FKeKJ6yc X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NJ227qr241Ov15ZawC1ql0N8vllgcqStkKXjKWFyCULz9in85zfSpi7mbBeEqiX8AQTbPUHMAxkhUOoOgxniVpr8+Mraj75A1IH7lW/+Iu3BVInOemVxAZkDfO6r4Y/wGooTJ0RLTLUgFjsnJey8qEmNUEv0i+UiLfoYakAgZOpDIIAU4whYq7MI2XU/tt0bHhYCVtlVdULeut5utB5/2Kp3Ml9lljLF6AxKNTvor0F8jB5XvHxVkH6lVIVdbL/5qQLOUeOQJad70Bhuu75FnbpzGGrXeaxA0sDJIx4brKNUhdP7kL7UNZgSmqAJEJwYxNY2w5Rq3smJh7GfTmvKc11IpNkM89E4YF2VV9SQehmx7+20xQxIfm3VmuqxgoiRWSvcExBH0pkHF62IlUbaf3oF+PQz1rV3rBbQPxE9YhQUZqnxZV8Hoctoa8TtsMFsP+bMFElgWNAWcifeSb9EuKASDmiU688iLml9r73Gu1Ha4GovKQhYZG9Q4UA+PoM4gNvoOTq+vQ8O/3p7NEZxg2yDSKD6KZ75v6o1kzjEgu53W+KIYH1nu9OJKwnzfy8MNzWzNsqsU1f8P5WwQl5kKMtTH53c2rbBcgbyT8xEg6vw/OS+Ww9yXj+++LtC+MtGpsGSZCd6DXypgV7zqVop9r7BPb6OgAAHGckLV6sb9rkM4GpeL62x6+2t8ScIOtH4XVzO9vwCG3Ws1oCAfHBZCcQ1O/okFrhoVWsJ7CYucXDkWO559wAGV0Llt/4p9PWsIfCGCgzcDDJU01OX3UFYkO4Iy/Pf7qv+17IGm5MaXD1e7FlCq3K3wD61RsMOXvwuqhKpKsugiR/vG+z2sF1G/NKQgEIYnC77cCb40L3REAzcjk+D8NxnNDT+O4vRA1k24Wob9J5yZISStUbQ1cpACSUEsu5zySnfkpbP0RvNn1Ou4FRWGzixPGHyBsyQXvI4zTBcCVH8py01csi2J2O0uGD/26jYJZgZ3VyFU1WQUMTtuCPULe9O0Q2D4QyQgIKQeQq2jUKV9JRemCN67bhinax4we/eXJ/Kt3g0PGwjIxIOHyMqzl84wyx1oRmd3gKKY3DJh6dTFmBdgO7tjQhzsRRbKU31fYvdpxJl41pFRIoNrjAEoESXIAxHHYN0mpb0UJ33lWqdjmO8t9jrMBFAypUqreV9zORIExv3juk6XVQPdiIKakQXnju+sZ/NDzPqBuS69+SGrmIGGDjafaFsnV0KqxIX24nof5+D6RSCSwgXKyE4M5t44NfayhbzDk5GsyT75TjR9mQrmkkvZ5lqTQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2d573388-0b8a-4586-253a-08dc9f70c9a3 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jul 2024 17:09:55.0098 (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: AM8P250MB0181 Subject: [FFmpeg-devel] [PATCH] avformat/matroskaenc: Fix potential stack-buffer-overflow 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: p9L/jfTYAAO2 Forgotten in f194f291d8082134cdce625b0ca3548067428ea9 Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 216cb48884..e1adc0eba6 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1758,7 +1758,7 @@ static int mkv_write_track_video(AVFormatContext *s, MatroskaMuxContext *mkv, uint8_t color_space[4], projection_private[20]; const AVPacketSideData *sd; EBML_WRITER(MAX_FIELD_ORDER_ELEMS + MAX_STEREO_MODE_ELEMS + - MAX_VIDEO_COLOR_ELEMS + MAX_VIDEO_PROJECTION_ELEMS + 8); + MAX_VIDEO_COLOR_ELEMS + MAX_VIDEO_PROJECTION_ELEMS + 12); int cropped_width = par->width, cropped_height = par->height; int ret;