From patchwork Sat Apr 3 14:17:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26721 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 58EF944BCF4 for ; Sat, 3 Apr 2021 17:17:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3219F68A7FD; Sat, 3 Apr 2021 17:17:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-VI1-obe.outbound.protection.outlook.com (mail-vi1eur06olkn2039.outbound.protection.outlook.com [40.92.17.39]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E1DA68A607 for ; Sat, 3 Apr 2021 17:17:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S7WAEvfvHFFcDqOkwEvqOyECL2O2O0pns+y/C7hTOS2ywia32mfzP82m54ZCAIewAoPnwjOwlEJHSBh0XsFCw94YAUOL9cpEXxgVDeaJ8XWBnKGyJP4ex4MetJNmUUTxF+kyi/RiLgMs8mt8ZXEFno49HEAZgPLj1D2nRlhkxGKIhzGwEWNoTG+vJoj30FuGn41I/JWyV90EIWMoGTmfRIlnNg5Tt160PzRS0+vV9SQv7dr3rDbdK68eKzhI+/VbMiA2vM/5+PhcBptMdD2TEqqbTVFGvbr7ANIUIeG5d6DIN48iZFRScHeWzjQr5rmCvxwaKoJ5yYxxMHwr+oTLEw== 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-SenderADCheck; bh=v2pDxGLIH7wvTVufpp4qlo29VvgB06xh66A2fN8cVHg=; b=SpfFw322OqAlVGAEbCmh9k7Vh1nSTASLDFxMQhChMx6AsSFDDFKh+FlSyJabV4DW67gyEyTgGOPlI/EkFfNpSdZhz6tV5oJjPz/kMB6LhxfY8iFlXsIEQq5L3df8arQ0NFWB8EPc9klGTmkC6D6PVBdKVyLD12G459nRyuZHaOG2JXnbSiLSyREqL8fJhd2mxR8c7tqKCZqQ7YOLAFBs3XX9qpP0UGYz4+C07nzIFz1rzxYr5AIQN+J3r6wVfazMKfCuCh/FSkqmXl2tji5522mPYUi8gavBt1qRk/qJRXeYldv2EZNOpsvd131js1hs1W109qbjq+/dFJ53jVJ1Rw== 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=v2pDxGLIH7wvTVufpp4qlo29VvgB06xh66A2fN8cVHg=; b=JfJRmuUiZdPa8+y7TLfmmil+rH5FnDhHFTxmvQQF89w5yTHyqCyToeempAabf09NsPV4xMC02m77ERViI17qjhBxcz93FSazG2MOGl7qVCknlDqno0h3AOSE+f0hn/OVfS01a1sb7iybosgL0yX2YXVFeVLFt36g1MnBCU5Dm42PFbeN2HV2m/JzuFpUmnI4tSsFE+qQT7cOoSz8i9W576tbgZi0EtT7EsDJDb5ifo56DVl/ULs6Xg0UwCcUqY4pOupKVjYttHepUM9o6d96NCBge1SAhYh1K+lYKKHypnUOAPFfqLDC87L93G/UpKOGlA53/Y5uh4obEtKZxRutOg== Received: from DB8EUR06FT044.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::52) by DB8EUR06HT183.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28; Sat, 3 Apr 2021 14:17:39 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc35::4d) by DB8EUR06FT044.mail.protection.outlook.com (2a01:111:e400:fc35::280) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28 via Frontend Transport; Sat, 3 Apr 2021 14:17:39 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:F74E31B628D954D038B22827E1E349607B3451F9164D26691E1831A90C6E01D0; UpperCasedChecksum:87D519EF6F3CBF44E40DE644EB96460FEE496B89D1E3139FFDAF74ADC8097C34; SizeAsReceived:7391; Count:46 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21%3]) with mapi id 15.20.3999.032; Sat, 3 Apr 2021 14:17:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 Apr 2021 16:17:29 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 X-TMN: [x2JUfxSBaKRtdNpQclhGibb74+ltkpIT] X-ClientProxiedBy: ZR0P278CA0009.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::19) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210403141731.3378522-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by ZR0P278CA0009.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28 via Frontend Transport; Sat, 3 Apr 2021 14:17:38 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 81d2ff31-e7ac-402a-dd32-08d8f6ab3c99 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQPaLYvx5HwmzXq2KsiysPmCUaf2gAI15+SywcLpyD7SJ1cKZL4Uyo5uCt7JHV3jK6rWEDU5ZqxBfw+fIuv2rYp0MYcWdkVGvt7n5p1FMSrnpFm4NakbGhhPLGgOvtO1yinAmX/zEgawhIqcqvvmLwHmg250fk0y26u9ro1L2UjB72Z18wxlXpQw0Ybm+9frVFsVZgA+pbg45eGAnf3Wc9EBcTBWs1u13fXlpLw5ckIO1f1UEYvASERPWuHkgs3c/5OQfB9HywIm3oGnS8LZDNE1Vj5CiLdfaXGrmalvUNxXmUpVhQfwCQdyj8xy4jYxznfQwDgf+Z/iolki8/9IjFjRIHqxG5A62DPHM5hKz/vc31Y24Yjyt3qY9kluZyntb+/HlBek7JQ+OmHIbG/KtD1FlgU1oRd/gYpYnhbmO1Lv4O8sKsf9leeM17rWptHvx+Fuo+slCEnHNZhMJZsK157UI7luzwXNRfYsCNImPAusviolKm88z1HQQOq1pPR4HvdteeT8sAv10/Foq3dYoNuU5/a4gPTQAHhhu+oF7ksrA4hTnHFJW4+33+nqIMCc+WXBh9ve7YNqbYKwMArttaRQc/Ou5CE14KYrC/o+cRWL90DXUsmGKDiGGrC0Or/xK6rjKDvrRcNOcjsHj8A3rzPyoMQdc6OAp4yIUMvlNZzupo7DJT1O0I6pbY9DQX+MHkSGVyQ3TZLywXAuasRFoMYHX/oE4wx0FD69GBMgouHSCdmPCkCGo4Ul5O8YKG7dIY= X-MS-TrafficTypeDiagnostic: DB8EUR06HT183: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NGZJWwzeR3H3L3A7rffMe8GlPFazD+bcnk6RzQd3ZDlwY1OhQIop1b/7lUnc0xgqYVk9gXgsrZWVQaTf1NbFkifjyFAujsZdUIZOcSynYTfkiggDR4o7xMfVwgdKLoTW5PFlkgCr8L+1SJRVc3TDQrNFnaQ6KysxJFr23jiLZYaI6FS1l/NCRjsun66Qng4+enUKWecyoBnwTjIJXinmfS9WHm+yfxvyi/9qN6bdf3mnBtdV5yD2A/QTqvggBO5gjgZgC8T9tYlS+hKrbLxU2Niy75oQfHM9SuxAr7gJnk6XdDBGKa3n1xBoBjX8qUqzntD0d/MF61M8eSVXEl4zUp77L15qQE3ba9rPzQDWb1VwitOFsh+mP6TFrYtBOVZwIiWBBGnvwb0/yhr93F2NkQ== X-MS-Exchange-AntiSpam-MessageData: DWf8sg7+NAH62km4LjsTg0g8jWfKcDlnn7rz5wx/Bdv3GKYgqO20bOi4BV2pAL2lx9DHeY35IQuIvcZXtiWlemlZglP2dNlYJfovYNMPLnFak3X05bmYdVMXTTSfbKmwy8zvlBrLzrcPRWE1ZWThbw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 81d2ff31-e7ac-402a-dd32-08d8f6ab3c99 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Apr 2021 14:17:39.1931 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT044.eop-eur06.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8EUR06HT183 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/mjpegdec: Fix leak in case of invalid external Huffman tables X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" When using external Huffman tables fails during init, the decoder reverts back to using the default Huffman tables; and when doing so, the current VLC tables leak because init_default_huffman_tables() doesn't free them before overwriting them. Sample: samples.ffmpeg.org/archive/all/avi+mjpeg+pcm_s16le++mjpeg-interlace.avi Signed-off-by: Andreas Rheinhardt --- libavcodec/mjpegdec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 5583d2aa35..776797d35b 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -76,6 +76,7 @@ static int init_default_huffman_tables(MJpegDecodeContext *s) int i, ret; for (i = 0; i < FF_ARRAY_ELEMS(ht); i++) { + ff_free_vlc(&s->vlcs[ht[i].class][ht[i].index]); ret = ff_mjpeg_build_vlc(&s->vlcs[ht[i].class][ht[i].index], ht[i].bits, ht[i].values, ht[i].class == 1, s->avctx);