From patchwork Thu Sep 23 15:28:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30507 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp567615iob; Thu, 23 Sep 2021 08:31:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzigNa5/nhDSYhgCIOH7kF/Nav0UxH0A3efF8DULPjiQUrmgt0Nar+NSfCZGH/tb7p19RW2 X-Received: by 2002:a05:6402:2913:: with SMTP id ee19mr6129217edb.332.1632411096753; Thu, 23 Sep 2021 08:31:36 -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 s25si6456836ejm.353.2021.09.23.08.31.35; Thu, 23 Sep 2021 08:31:36 -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=hXDS3Wml; 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 E4F3F68AD92; Thu, 23 Sep 2021 18:29:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065073.outbound.protection.outlook.com [40.92.65.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4951D68AB29 for ; Thu, 23 Sep 2021 18:29:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AoyQEBmuwX3IQNl3pnMFfBN1XeKm6A5cEwy7H72cmupJeelbSkB2mF+eI2GbvUauIsK7tDSOgT0BiAS5yBhL51jIEaCTezJQp68pedlNtU3giZsnE6exUX+KbS3j/BrFDkbkg4I7uCJ9+rWddoxuIXQmHEB0PDsKy/VDkRq1MFu6xMUSlXsUHhFM3FRmsNIgGkgl+LpfXmgDAQrAuWm4DjbjtCYg34vyZBhmSJ9BY7fbncdMAcP1I6j1nxhSbXCSGQZRfjiGtwG2osSXCs+hHUQ4w3KEytzs63c58zYdWoYjd1bN4Qe26PsPykGg852z6iCp7LDNCche/9OBS23YSQ== 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; bh=IM7Z309UPVS83LpWRN9+vu70QLqBizxtrJfV4p1xsHM=; b=W9EXpN7h+MU2QnxKOgVVlBjT+D9yiyA/8Dh+/epWrAIlN6UyxMpseqXNKy4C7f89NP+Y4cK4v21NukQeojow0AvBAl4jO7sy6ybJHl6Es8MvAET+KsZ5yWCwEZjXMIlBvisXgXb5I0l5uNwob0fr62pfpN8mloB3wrpvI3ivA6UyujimZbFIe6uHQjUH0xBGg0Wf0wUrN8AJIB/nCo5GB8p8ZfdeAzcFFNcebfsmq9LvOPCMQsPd/JWnzKRSp0zXCpVdFODGSKLIDl9I+FOMMN3V9PtS9p2u2+C9mg54Z0nyTl49sFemT6P15rmTMvlPyz6U4sVWns6Q2foZbS+bUw== 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=IM7Z309UPVS83LpWRN9+vu70QLqBizxtrJfV4p1xsHM=; b=hXDS3WmlyotDqZqGdgY3hU3MdQqxept1VNIN5Z59CwLgf1SwHEAmxCpZqIrCg2pXVVGdZYH3ij/WyiasCQLH0hu4plDgaYPIWjxdn+ZG3YShtnypXVubwkwsolzNmwglJYR/IKXpU4p4Bi5JTUmBXx0yMMkkqLI0h2FRP2YQeUlyhogRgWv6+wRLthILx8ow5GVRDXbKmSHfk5lDBFJjRB5vd9w7oqxdF+zsPohObEPcU3GxbaYv31NkkX33tEut16y/BOMF5XH6SWXM7bxasQyg5ZRcxd8esRJZBFmmZgiINfHn+06qmP15arv2CWEZrLxPojOvMYz/31OEL2lLiQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7061.eurprd03.prod.outlook.com (2603:10a6:20b:295::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 23 Sep 2021 15:29:37 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4523.021; Thu, 23 Sep 2021 15:29:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Sep 2021 17:28:48 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [2K6+dBEMi1tkHJdI/sx0ywSfiWRwzRPV] X-ClientProxiedBy: AM0PR06CA0106.eurprd06.prod.outlook.com (2603:10a6:208:fa::47) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210923152902.42865-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR06CA0106.eurprd06.prod.outlook.com (2603:10a6:208:fa::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Thu, 23 Sep 2021 15:29:36 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3c9dc2c2-e716-464a-2606-08d97ea6f3af X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/ULYlaWyz2NXCnwh7Enrihvq7C8EEthsr9c/bOO/VK1u37gIqKZwCRQFebaLs/v2Hlv+HRptg0aVBv/HsZUMFpVWan7aUI5SGX72sv74RwJw4c1wfXL/hWKh32sGn/Xvv80NBH+sohCkxzzbCTfMJuPZxlyemK5VqOJHjqNoINtAf/tbsZj5Kw+KM5Iz/ji/9MR6wqtR5ZofZKUymYxo6Z+j2DQUDDAEVEMP0ZCS6FP3RCAZCKDBeOkX1Y6JTtKX/DIYPb4oVl9L/uHrOSjCKyNbStTc7MPdnHbTr4rUek095VI85geYQAZbLSWEpz3wKeMYHJDNBcuu8gxaWI1Dgu8e/U5Ppb2v46h4JZt5ZGEiEnfp5+6+4j+a3vlG3Y7xzNDs5jC9oyybXRWs0APMQXiF+6C9wwSua0hNwDEXV34Lpm9+FuOJQR5ptZdrEBSpJj9PXoKEaB8MWW5r6oF60VVOrFQaWdckH2J5zrzU0+jGsAxh1pmXnG0LEInUgw5W6QrzjKgzDT5E5cLl3d9ATfnZX4eVBqLHv4pKag33Qr88fKohr47losZFfIrtuWFeZvAmNKMPOCngLV7LjqIP5bi8BS8RqTBfqqSDaWOWG5XK2pR0gS7UqXZQzTH9a2Pt1BHKPQn4TmBGgSaWo3XN8Yj0AfbsMzhbYhaVRcM/G/bGysl6eh5mcgwkNSc+qdcoZH30RLrKkqbRNg== X-MS-TrafficTypeDiagnostic: AS8PR03MB7061: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MtGZKOHlhV3i25EH0S6yDKNpxn/2dtBgVxd2tiGYYcR0xySG8z5DmZWcMyTthfLLOpkcJc0JUriSUMfZiKnaCJB9+qLQK2fUAwMfbbodDFaMD9pGvlSyiHS22mCKzqPwsLd8iGtFKyFeXEJ7thWtkV7OGFNG+2qnSjSdA/OnazMWVpwzhTsw73a/PcHqMXmDszSBWZxTy8E7bt8RR3qUeIFg8bOVpo143uGd2yp3CguJjc6CSXB92JTpK8P+LnUVBYahygocV2DHRnTHENe/6E1nJwszDEMmvJCOhQLCd5W+KdogdaTki0JGZwK0ZJJWlT9T9mov2MuuaKHTCC5JrYQguxYt73nKAXAHx1EiP8YaSw5mIu6QnHInPgQMPqQoelhWmC4bt91F7q7N3EH+rqKPrwLMl6Fo+Nsum8rcn9TK751msiC0JPkG6zyyhTUH X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xYJaIGnhfakjkS6l+f4tBnibKyghcJ9ShEtqkaOj4HmUdZv23C8SlK8mwxMn2XO2MCLXU6Sxmh0vvfl4FmxPxUl3QRANdfXh7uc4wlLTU3lFUCdWCMWV0hfoH9bJC1UaCoXQyKOKhpDZg7+//GeOBA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3c9dc2c2-e716-464a-2606-08d97ea6f3af X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2021 15:29:36.9829 (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: AS8PR03MB7061 Subject: [FFmpeg-devel] [PATCH 13/27] avformat/movenc: Limit ism_lookahead to a sane value 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: wQNqQ5jrg5Dq There can only be a maximum of 255 entries in a tfrf tag, so using more makes no sense; moreover, several size computations can overflow in this case. Fix this by limiting it to 255. Signed-off-by: Andreas Rheinhardt --- libavformat/movenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index cfb5a5c725..53c8ffadd5 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -94,7 +94,7 @@ static const AVOption options[] = { { "frag_duration", "Maximum fragment duration", offsetof(MOVMuxContext, max_fragment_duration), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM}, { "min_frag_duration", "Minimum fragment duration", offsetof(MOVMuxContext, min_fragment_duration), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM}, { "frag_size", "Maximum fragment size", offsetof(MOVMuxContext, max_fragment_size), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM}, - { "ism_lookahead", "Number of lookahead entries for ISM files", offsetof(MOVMuxContext, ism_lookahead), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM}, + { "ism_lookahead", "Number of lookahead entries for ISM files", offsetof(MOVMuxContext, ism_lookahead), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 255, AV_OPT_FLAG_ENCODING_PARAM}, { "video_track_timescale", "set timescale of all video tracks", offsetof(MOVMuxContext, video_track_timescale), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM}, { "brand", "Override major brand", offsetof(MOVMuxContext, major_brand), AV_OPT_TYPE_STRING, {.str = NULL}, .flags = AV_OPT_FLAG_ENCODING_PARAM }, { "use_editlist", "use edit list", offsetof(MOVMuxContext, use_editlist), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, AV_OPT_FLAG_ENCODING_PARAM},