From patchwork Tue Nov 30 10:50:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31838 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp7466769iob; Tue, 30 Nov 2021 02:51:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJwwFicPXgpk0evJb9G1QVd32T2TLatkWrzHBA5lu2vN3+thuQUvbpZ7yeHC2L2tXJV3k08I X-Received: by 2002:a05:6402:100e:: with SMTP id c14mr83342663edu.196.1638269472358; Tue, 30 Nov 2021 02:51:12 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hr36si38176407ejc.483.2021.11.30.02.51.12; Tue, 30 Nov 2021 02:51:12 -0800 (PST) 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=AEqyl8X2; 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 EFD0468ADAE; Tue, 30 Nov 2021 12:51:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068099.outbound.protection.outlook.com [40.92.68.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B683680BA5 for ; Tue, 30 Nov 2021 12:50:58 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=euQugyK1ZXksoKyO6V54DHKYdZmrKNYG/WGnFuZav7obHhl2Vwxu10os3hzjPgLhPq9dGy/smIct61BQW/GYjhMxbfAxNJLEz/Kd7WnM6pW94DdERKXoDcxH+glWariUDtD3qqQctASxHHMZ8sBvoGo3PVrSJaFZdD62JluNkaXlbzxD0RnmsLZLLII+wmy6gGUK3FvlHI1mTY2Wpm8IrtcO2I3YxuvJICkGbJt1NSUC4hCIuwvOswYYsPubUx7+6krpe8Z0FCo6H6hXA4Fpv2BTFMD/zKPsEFmgmMNCOKAP4ZwYRVTu6vrmWVHzd0/DWbTUs/q2sSphKKJ/ABkjSQ== 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=hPHnvIDUiL8plBbooK/HMDGVO0WMBA8qFqS7Vm2MkrE=; b=PbxDHfCkzDYnfN7eZzoqPEqoV7hzRSg2OvAElM+2YD23H59npWLF6XlyhHKOdFER2mJvjwG6zWla/gf6dNXmRUi4XVYcYnz96912+iE24CPDV2TFw+ZzNX4aVOtkA2jmobchmn/RpF7QBq5RfVTojD7kkPOv4jf1nUZKp25SIXBM2r5VpITVMZvfRtlj7WgHoc9y4lQlAEKmrSHFLcHW7WjeWngHV2RRAJEcVNnb+M7zJqsCmMHxw/BHILqlxcJEhcUxs6fRYFKbjEk+xbHvqfGz3mureCznXBgOWeOVwrB5lM7HajmDEeRLX292mITg5uyr3n2xif0DRSgPXGabWg== 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=hPHnvIDUiL8plBbooK/HMDGVO0WMBA8qFqS7Vm2MkrE=; b=AEqyl8X2nS9FL4iHUDP1Ig5LYwoXeSe6/4KGN3Ac0n0KIYuv77VXB1ivq4axfHG/zUM3Wgc1O9D8adOMfh5xy+Fv+Qt8PWvjyczdOeXewcFcvNLvHl4hzENhXOur+xK9dsoeeIs1o+Ji0RbEvYHMitw/oBxqCFiJXIyorfOOeat3BmrXV47IW1L6XBFB5jLuioq0btZ7rFVIqntaQlrJyPF0IpqhhVCzcUEEEPgWxZXoX7h1E+tta9s1Y27rJPTtcdHbcWCF2LWKKU2581Nl2ro0Tp1jc7s3kLVk9JHR7ZuZYZMu7fRtWmnW/8EiEghRnzcJdGGfYJnFDxX8vc++VQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB2850.eurprd03.prod.outlook.com (2603:10a6:206:20::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Tue, 30 Nov 2021 10:50:57 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%9]) with mapi id 15.20.4734.024; Tue, 30 Nov 2021 10:50:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Nov 2021 11:50:40 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [+V7KvEZQuQyMkwc1IpM65feeNGoBBog5] X-ClientProxiedBy: AM0PR02CA0156.eurprd02.prod.outlook.com (2603:10a6:20b:28d::23) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211130105043.129538-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM0PR02CA0156.eurprd02.prod.outlook.com (2603:10a6:20b:28d::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Tue, 30 Nov 2021 10:50:56 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aeabec0a-2b7d-4012-1d79-08d9b3ef49a3 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUVf4505pHrBHCMEJhBuWzEPayCIk9F6P27UVjS8sYV7Li4JoTWj9T/5LN2WyhPi2k9hHcZtSDLj3z6XQPI5Ybr6Bnvq67Z5ifqGDv+inq85spOZk+Yn8Yi77HhBDo+MbfHoxF8LPJdF4Jiy9ZDkyoAmuxGgw5ZzNI4FwdrV4Z70CGswdcVLwYXhh5czzwj+FnwVbgZs3oajugfGOKu86ECWNyZw2aeSt5Fb4bhQ5N+7sadUgFwvO3RHM+umD+GhWcJmJoEwgxUOE1kM6uQGhsiqozJLM4NlKqB1rqsoYgSwrPlKGZjJ6g1F8bddrDj8cU/sB4eaAVrEjOrLFiEsia8L6+/pqn6D/HdoByvRPzOaOButy6V8vACOKYuKdhKMqIjn3Gby+DOsdCCV+rPXMytGMbRFynNTnLTDsVKUC9QLWxKhXsC/e5se4Qq9fFK1WFGhMlKTqENiFCQBZ8Fl3yKD8fk3ZWL/bou7CkLXmNxX51H5xyyH4QAcDmSY4szrwVrDzxRwhnFYM32sC+X6vkyA0S11eck5nZy1Yy8aefH0qJNLoZZ8xiZgqDbl5akfZajrfhRCe/rdvv8mbhN21Qd7/indPO7Dcnmq7oFZRHSDnGARVUMpEEFeEyirYCPANtst7wB4xafCV5EqU8073cxwHD2SUbtkPRjah2kU5pHQdcIamGJ23IYj2UY7uwzvuXurtxBGHcAsixzOqOVB0DB0dsjmcxFb2c= X-MS-TrafficTypeDiagnostic: AM5PR03MB2850: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wB92ZVlOgEY5f9Q1G6fLToTzMy8pRMKPaY1X1Wuv0S3e4Ag6JISgSmttwzV7a0LkUv6J3QAg2AgyqB+FZnoyIiOF0aGMHzHyqXrXtMwWGr2Mg9BdIWK3kegtPUcBoc8XiudOjx3z423pqPnbz56Khobjc/oU2ohM3nsq6Cfc9fXD03UD8TPX0HdAsLCndk2oZHJP7QEb/5Y1636Q9v6sqNU3iEcBxS74rJJeXYHKgiLFwbZd42M07GP8HU8ZIbLbaMRCPKW7P8WXKmB9irJVDi7iXziH3PEs2EE5kG5n5yT1pipQcbG1ZmHZHHj88Tguk/6H84MS7RdUs4WFQL+gvBvbQoI7bPmyLx0bIvjOsvJb3tgo88vT6DzpEhpqCcqXYouAOAV8LA+qOjFUQmydq5plx5XgtRr5aFpSTjFFH8nZjGg1Nh4YdUMsNY+G+0AHlx/PzJ7hL7ugC64W/AuRXLbP5AuEVMGHzJq/JwBuQZUA9BZOOlkDQX8fSrngB2o/GDYYiCaNsOztPkib3nFq3B8VXYaer43hlfDskNytHvH+KDq85We5us5Ll+O3MAMaZKGHUJ1/FI7gdjGnSAA8sQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Qy+K+ixwxm7/EEAFTvZh0u5O/YxjDBFodOEKOtlAhLzwx/2lQntKuitc2/3xcKEjZCMChM10by1TF/EBPcTZl8Eyu5ktkeDbtE2IYmDxh6LxsNDuLqhda3QkVf/ECmLQBNv5RLY4qmhXiopby5q48J7oXWS7BrNPbwJZVCJ0gDoypKABhL9hB3DhJktUuFLZHAaAEJUk4/OvzrOjOFEZwynKtBR3BVtq4tJX9dXjzalVjMcglKsySL+seZ+VtJepAhBV6horC1IWZ3cxkopQ0E1NMyZl5eC+JcinmnVy4KCjRgb7SrqKhZps9ULUjygW9jE9Yp3b4X8+tIAwyaFDCwkEVOcGe8TYfmGxJrVzvxFx0v6XqqkW+YiE7IiSkmLl0LQxnLDJlgyQBCicBLgpEkQThZvD/viWpIXcN9FwNxupzMdd832R5EEJjINzxOma7zg/ouLJuAPycdXM9weTv2vlQ+c0gRLV8FMS627BpZSAWy3Q+TiOLzja6xvoNkTaEc3em6PibStHexUX2TUAlFRiqUnPf/FKcqLPK1jPH2tG3mG7uCmZChDZadzTzbWslJzoI5qxmdWOgJ6D5nNWKpG4+nWTuIPi5z6vH4Q6w4Cni8EBw1KhMPmPEiWmX6WGnm/OXi1oHNUwMDnzmGSoRaYtRET7cqniqnTZ5de+v8r/ykEB1W4O1I9bOJ9YKHuhXBSFeTltgZBpy3JAU8ZI6z2FecEkzbHYYagPM6N59zDsSnvOtZ9ebUwB9nWqDMQT4IGJOM+v7S1mvPTJRKMHNT1qyZq7XwyKilA+knNkYHlrBrl3s2AO61A8NVIwZgWhLOsA0z+tl/3OkJ/48M4y1SNGbjLEiPX3IGhlWnji6Rf3ghNhjmyR1ja7U5qou4mBBTzBr6EyW0t1ainJ7tVxF8bYNwyi+5+dXPI7qmaXB/MAlvdVcitPG3s9MaIl7LvxVKZ9j4vgDoajItlawDTA6g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: aeabec0a-2b7d-4012-1d79-08d9b3ef49a3 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2021 10:50:56.9104 (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: AM5PR03MB2850 Subject: [FFmpeg-devel] [PATCH 3/6] avcodec/movtextenc: Check for too long subtitles 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: 0bDGEElNxay3 Signed-off-by: Andreas Rheinhardt --- libavcodec/movtextenc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index 46109e0a5e..eecadaf503 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -667,6 +667,8 @@ static int mov_text_encode_frame(AVCodecContext *avctx, unsigned char *buf, } } + if (s->byte_count > UINT16_MAX) + return AVERROR(ERANGE); AV_WB16(buf, s->byte_count); buf += 2;