From patchwork Tue Nov 9 18:01:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31345 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp1493486iob; Tue, 9 Nov 2021 10:03:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJyDLuyO6FcESy1+3x1R5W2UqiUYFU4YqC/q2zaKbFbfClL3fW5f8cl3/upjDEZeSgX3UBy7 X-Received: by 2002:a17:907:7210:: with SMTP id dr16mr12075608ejc.267.1636480992111; Tue, 09 Nov 2021 10:03: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 l7si32254784edi.523.2021.11.09.10.03.11; Tue, 09 Nov 2021 10:03: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=kb1+vdUb; 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 C596968ADAE; Tue, 9 Nov 2021 20:02:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067055.outbound.protection.outlook.com [40.92.67.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A1E6568A817 for ; Tue, 9 Nov 2021 20:02:27 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FBqeQN716AX1GDP0F2bfdGX8YvfMBwKlzH4CEOlDme+tYkSA/WONRWdlMNy2v5yWfp8qQucNZ5P7om5Kje2Y6xcUK0Mrv5Ffn98Ujrf9VizCJ5nM6B/sEGpAUOOBqzBAdYi7xceNbrZB5sK/IIN9n9msiJEXIE4XhZuFv/oPq0/fgJwgNU8wBRHq7gTha//bTuVj5UVIL9Epc2wCX1Y4XAgqO8sVsvDv//ZWV260q70IkVPbDN03VzYoyYsY7hZSmlR+UEP4/qU2KFq1FRwO6a0r2xUGWWVN3oxqhPcg378xSvns/5Qo+eo1NdLpnZGpg8g87A97RcpXnK4/vbr1Hw== 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=pzrgXAyqSCUN2J4KfCt2efwSoAzvENwdnY1FabxCzLo=; b=SidsP94us+ffrOndovZl9GEs5SAAHXCMvSjlm2uD/4jri1L51a7FCkZREye391AjTzRXLg/PeDP6+1uSXRvkmuAW5klXgNYTcUx2eZCcrG/lQF9xuXC27wT8TN49lLVFVgRgLJbWHJ5DNHk2GoueGgUuNiLvq6l8y0trMH5F5IsRQAh6/pLVqshCWKsUV1hWIuHt8GiiNAu7N8HDpIYi/pvTa+WAMCNK8tmonQi+PFz6FfvnVJw2Xw1oX+zCs5gXXfYns7Lz93seEEzik0V/VKANjt6iwspfeHjUMJ7VTMT6fuoP3f9pJZ+kPFbDDsEhS+sezk3G8WfDJfktjYG/NA== 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=pzrgXAyqSCUN2J4KfCt2efwSoAzvENwdnY1FabxCzLo=; b=kb1+vdUb4fAxMMaEA6Uf/DzxGX9kohnvCYCFOLP+e880yi2tmsZoMUHEJjM5Xrlci89/IMl3ROyf9miRZCgVWFWyW+2VTSXISi+2C1mFvwd9UONtZ/hUUNMf/6WFkAioLW2fpGv3dvUPWUilhFLQ7jC5GmVG+fuhtxnAo8QYEE5QxB3mAA9jh7mcGITJ6gmuKWHca32p1hIIzLIpE+XnLPx1CNmskAnyHDmx6xfUYGCgnUJSkvHlabRMJrQIFXH4eF842Z7Ip+yOdBfE7b9PJPrUFIHr7F8b6nb5cAxoTXCrsRiByVpEVifCq/Zc7y0xfoUIC+c4DBOlsAUZc4e6ow== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4775.eurprd03.prod.outlook.com (2603:10a6:20b:d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16; Tue, 9 Nov 2021 18:02:20 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%8]) with mapi id 15.20.4669.016; Tue, 9 Nov 2021 18:02:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Nov 2021 19:01:45 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [QP53obbb3QkiuhB0jBRhgQ41ttE5jrXR] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211109180155.881111-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.5 via Frontend Transport; Tue, 9 Nov 2021 18:02:18 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 37f1edae-0f12-479a-3e6c-08d9a3ab1239 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRIlshE2JAC11E3nazVg9SyU6Cr4WJar/RC5/fBwtK+TySHuER4OVAhGErpA5bws8V3sx/hnActcU5ZCIT8EvzVhd3pQGZnWuYpxQxtN5u5DUiB8aO8JeKOV1/P3HK1BO75XzHglmSCRnuoJ0BK7TLlAIGSETkRpfhkBU1KSfQo+c4g75Wzs557lvopoJ75RyA0VdFSV9Tg1lsn2D+s9/6YLhVRocq6f3ZzGfiX2Jq7MzJmM//3CtbW0kJu8+HZw6/l5FRpQAd07nKiA3or3Cube6Va/kRFOHwALUWpJAyUAa/f7k7496JBt2rj16ELJEBuzkcqiv44Z7WO4Iu1MXJ8TmngpQYdqqXJOfvl4nksTmxPwT2jMso9JrLWzSEFOm3wth66hGtcDzT6TU/VsyV+dQbglR6TCcB6z+FoEEXNIDnToYjQUEC2s5+UAEF+LXq1G4c5Ko7xJXhMCZXQ1v5rwZN519yMUHDO7J7E3rtWym357olvZ9EyDQKED4oe4Nzd/JV7RTAsuhenL/zSpFvgEFjy148Dpfy2qvAITeRpoja1mFFIvrFBcqr/0oeEaoNKisk8/0Bl0SZF0dPmdKM4QWv0283b/SuUXRbao6ouN1mvePt4hEe1mp1cJNS+7k/daZx/GTK2OH85By8DBwuMy4zJ3nfz/JNAji7XYgXiaBTZAV9Rvl+UbriiAPWcTxT72RtdLcU+RyIyi8FtMd15V1WaioKnFjFthwWzhfQ1WrpZwIHHbFTQ3m7Ws9vSmvM= X-MS-TrafficTypeDiagnostic: AM6PR03MB4775: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0nVal/nhY1MVBHIrTprNofMQfX/U3HJW4r8YfxCWSy1Vib4wZFVD0zeg+TYqW19vABx6WZ35oixwAiTgdOqWi+cWAJtXRbnamqIa5+lr1Eut/zozXhzfNtKt3PSoggnK+fKdTxas8yO2jl2or+QRUp5gJ1Aa6rr+LGazvHzOkVAGLqfRWk6I+lYhwMuRUQTmq4RVzeysJxA/kN/qJLON0TAqamvWg8C6g8wuBWk+r9DypJyxRNLEd7+bguUv3gQJtHfb5QQcMAte9SMYjsoJtGuTpCndnlNzdJFy8GAoywkd+dnzjkdLqvA0aTa3AHT1HAKoHgHj9/ZOVP/rp0AYxFfcL/dN7oH8ZnjEU/o5qtWifYUCRkCkZmW4TUXtWKnQGFG2behrPJeV2+MFs9fCRauMTKx6MCbFut6RWFYRS8K2w1MIuNN25DNi0DuSH2U1/DRJ9D9iK8n0bBN0HsEnDKZbhfNlBjuMerwThFGGWS0iUro303ohM56g8nQXyjsAyJaLwq7EfJ0Dc1DxB7nve/uykNSIixju5waBqkOGMyA= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: O6zDuKRuIgPU6bBsKSmyxhRjyiUvJY1RCJvIm744umANH4rGH4IhWueu3D/Q2dvuz25YQTKhH5zJopIypAqVTi4DcT9JtxlQmRgE6TuEHBUu6g96ymrYwtUICSG7/88QP8GehAORLeSifuONjG5PcOYyjQF6bI86CPYIQwxCJBMMSq+XdBV+MS5cMH5WP7lDGVR0BoLRjG00vr/m+/BqU5d0KTb2w5n8UeR9G9A99iqmv+ZVlcEsszO/YmtmUuEcSkV5Jf8/kcX6EDq09sH+SBSTruJo2K+80GRqo0DUqIL0Gl6VsBE9gw0Eacuw6C8QMu3ahr/NVLcziP/PQVMKIfMXZ1YFQG46bBNgOQiMhqz/f7QmBvYljYFKQrQIKuZ4jTd0rHkQ63hXRHn7wkuQotk5JWTF+Ru7mp/gxyEFdMDn82Tqw76oWSBAMF62d6F/rzAxO96e6p3TEEki/mpHD24Ycy2Q70TJjNs6+HmTOHa3WB5rI311s+dO0FW5uVr5482TEuBa8I96Qq6s1glMQT9Ja0iFXBH9ftxMuvqm9d7AwztLUbanQYXUwEZY2druPe5WJCvE2xEM+yPybV18IXegmNY+I2smwP5KvVLm7MrAyESgLuDk3Qb5DvK0XEetvy4hJlLzX85ot+nTIMrkZvGJvjj45zVpw917u5Fc8HHKaYugXNAlv7XcB7vh/rVZpzZfvNlHdF9VFzUqTEPy9g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 37f1edae-0f12-479a-3e6c-08d9a3ab1239 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 18:02:19.2720 (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: AM6PR03MB4775 Subject: [FFmpeg-devel] [PATCH 07/17] avformat/mxfenc: Error out when receiving invalid data 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: 8Qdre/2Z9eXu (Unless the packet has a size of zero, the packet will run afoul of the cbr_index check a few lines below.) Signed-off-by: Andreas Rheinhardt --- libavformat/mxfenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index a6535eb43f..c20ba9bfca 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -2151,7 +2151,7 @@ static int mxf_parse_dv_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt) // Check for minimal frame size if (pkt->size < 120000) - return -1; + return 0; apt = pkt->data[4] & 0x7; vs_pack = pkt->data + 80*5 + 48;