From patchwork Thu Apr 15 13:52:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26927 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 9CC9B449981 for ; Thu, 15 Apr 2021 16:52:49 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 61075689F0D; Thu, 15 Apr 2021 16:52:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-DB8-obe.outbound.protection.outlook.com (mail-db8eur06olkn2081.outbound.protection.outlook.com [40.92.51.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD430689E47 for ; Thu, 15 Apr 2021 16:52:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WcmKlv3M1adA8GvoioIjvcD6t+qSiLELRN5MJw2And8RzEEFS9VIH+zXVHjlsY+LFsUkTtQ14p/zSlPcTy81zUNO/zx5fXvZaaDQ73NNRD0v1DUlvujo+B81Wt+W/lW7mEBEJk+Et3xuqxt6QJvv9cteL2YdzUOlsP4thCGWOHYF5XbhZCnbTcEe4A7FcVBHfg9a0Qzg3m4qIlEKfzGHAzEOgQFfZf/S9yKRxAcUdrXkhhppEsPbDAAfKSU50ik/d7iRV6k9fOffFK6g5PR/qgrLcnYNP44HsI49OlMph2NnUuXTGceIswyBjbWJIFCNGKrurK8hx1/RJGfimK0dGQ== 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=KO2RyPq763UNp0DMxfXXVKL1hIHjlS1xrC+QvmTynFM=; b=CEk4wEU/y+p9PNbCmJkMWPjRHzpd30Prp4GF9CpqsS4FyaVLg04VbG27K1RuNDVF1HCxmonZzsPz7K7bHHPr5TEaqjoQfxDr8pYU49a6wynzuRrK7gwmuvGKAVxJEOYgI3LKnjiqH7MPPAWbwlTKmQC7Gm0iamtjlbcGzyorSv9C6WFd6iKaqi+HELGzBEvcs07UVe/kpldQ8nQkNVkFGHF/6PyenznZwEUiudH0+wGA3/qGdP/q1t/LqfAvt7eO+B7lxSNV5TPBLu3AiFStxxO1PHUh1xRjlvc9EYV/XC9+XZBOItEnfif/6qarkJVYcoHeHKwGMZUD/C2KSuOkQg== 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=KO2RyPq763UNp0DMxfXXVKL1hIHjlS1xrC+QvmTynFM=; b=qYZO8bdwoeIfoUV8ohwBdrsyj3RsGYqpFHIQ9kmSwtVREje3IwOqOfGnDVUgKQR+cDhncmHT+rHcLQ4vTVVCM/gNPYSzwIwQpxkcbJ4+07f3/VvbdiPuvO623U87jAln1UIqaJiSVn8N+Ej6SxS7XB1z7S/nTT2dYNQ/vJcN6To7Ig65DZZL2bjzzeWVIvu9sSXy+3T/XO/9swkclUoL7RculDpPVrETrGTBl0is0KzK7Z6874KO2iTFHpX61/dpYVBVa5r7MyCuI/GmSX/5ahp9VCUOLd7nLZbDsyWe2q3+1GB1Dvpl1YKeY1diWAycMm90X7ehyB7+baRtG5gUCQ== Received: from VI1EUR06FT027.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc37::48) by VI1EUR06HT084.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc37::467) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16; Thu, 15 Apr 2021 13:52:40 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc37::4b) by VI1EUR06FT027.mail.protection.outlook.com (2a01:111:e400:fc37::283) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Thu, 15 Apr 2021 13:52:40 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:7810DC916FEDD53D65C19DF3B3DC2238E26936CD7E7C6A1D28BBF32D7A7AD160; UpperCasedChecksum:A7EBFEE381732259B456DC768BEB7403770282C75F0C4E751E2F682FFF5E1844; SizeAsReceived:7411; Count:46 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4042.018; Thu, 15 Apr 2021 13:52:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Apr 2021 15:52:31 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 X-TMN: [/KvO5yEM7c9UthGyjXxGRZheGxXgG2a2] X-ClientProxiedBy: AM4PR0302CA0026.eurprd03.prod.outlook.com (2603:10a6:205:2::39) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210415135231.1443336-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM4PR0302CA0026.eurprd03.prod.outlook.com (2603:10a6:205:2::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Thu, 15 Apr 2021 13:52:39 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 1cbfe02b-54aa-4aee-fbf1-08d90015bbdc X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTvkErHHM9AEH3Gn6ptYLUgwFiZXW3mghikSM93zIzOFfY6YYruzdlDi2V/8VkUrxOAucHY1IxtcNh5Td96EAMPjnUPq+UfkHs0nD46US0j+YHLt7ajguzfGrXyAzy6CF1a9pOjz2OAzJAGLVBbTnk67i62tuUq7BBJkNcQOrRmPtVOnCdACTyf5eRgQWvJxz5aGckoAf9GSqyBL70qRIP/2NwojletP2B+uAwTHPJgHiX23lbMBY+nTYNkWKB0pPDb0aoou7S/yHjm0iPgM+lTVGWv/EiY4zJStauhEt7ErhvhZvz8fwrh+5GgrmtD7tFGw6oAtEkNWLtLdCxhezAeHd5VsVm+PCmECv3U386yGSa/5xsoVDfu4m+O2manb+7vgu7Rkq+SE+0aPuS/IRG4lkHU6Um7M6xmKHPlzm80NUbgLxcCAuefVbMWJGxNBPkOrP/Y9IIg2+Ut9+Du1SdBm1TAXZ4GTYDgqp1xS71cuCyC48SNZ6DFG6T8UV70ftv4vWrTBFhgjjGOk9itWOG5RhsMltxQ7HPbT2Eb7hcXv33TD9VbdEgH+FRhJhpIMjhH4MsGqJIujJibPU7gu8V06GxN9/zvWuApizAXaghrgiCUrXlURmksTplEy3bymUSyZXG9L8p20zNNyRSGk3l8kxCGr4MAcuVKJD4rTmGzT6MxJ88d1q6ng1Qj73O6lgGjc16gRy/6Pxnr+TcrgTO7+WAAyNP+uc6lJllRc6yvkJJmx0iRoIy6XNtPEm/W7V4= X-MS-TrafficTypeDiagnostic: VI1EUR06HT084: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DWf+rZOrhzjnJSqJFFfP+/liYtbTiZ2Q/enR9o0lp7adjBUICu+JBcl/z92S8Ajl7ppD7AsRo7tCeFfLxUC2G1vV4gSCZLgIJhqz+UEnMKaDEdb0eg7phZt7+irfJWWaxcYnnUwiUizGiOrbhAboe8yLHowMoT3eJVeF+hDzKSqw62Leb46lh6obS33KkxnJv8xSCrjSPO5f69szpMHTsVcJ4F5OmY6F7iqDctipB/nAnBKjRHd8m6NbcpYPO134PvTidmtsO+dfiohzbrTGhdMR716HhIMxe12UvZu+DEMTjgYB/s1LvDmTX1j80qTjPaN6BtKZjk6+SxIEbX9JemPfVJVAQdKju1bGwpBlG+YSpCvWIjhMMnVQemnmv3yaAL0aXM9NtOUGlzMlk81QEQ== X-MS-Exchange-AntiSpam-MessageData: AYFejqJ1vtJNN9NS7C71MXGWMrYvUm0fuvEV/FdqB0C6bOOGX+sVzJPrbhy4Fw/WqBjql1LNZOapc4ChsOpNh5gQ5yOnOaG4NhboRyyoUU4dsO3cCXi2YhwLELvzCLvdclsdYTR/b3W/Q6d479xCww== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1cbfe02b-54aa-4aee-fbf1-08d90015bbdc X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2021 13:52:40.7435 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR06FT027.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: VI1EUR06HT084 Subject: [FFmpeg-devel] [PATCH] avcodec/nellymoserenc: Fix segfault when using unsupported channels/rate 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" NellyMoserEncodeContext.avctx is only set in init after these checks, yet it is used by encode_end(). This is a regression since 0a56bfa71f751a2b25da8d060a019c1c75ca9d7b. Signed-off-by: Andreas Rheinhardt --- Sorry for this. Will apply soon and backport. libavcodec/nellymoserenc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c index 99ede2f42b..8670431dcc 100644 --- a/libavcodec/nellymoserenc.c +++ b/libavcodec/nellymoserenc.c @@ -138,10 +138,8 @@ static av_cold int encode_end(AVCodecContext *avctx) ff_mdct_end(&s->mdct_ctx); - if (s->avctx->trellis) { - av_freep(&s->opt); - av_freep(&s->path); - } + av_freep(&s->opt); + av_freep(&s->path); ff_af_queue_close(&s->afq); av_freep(&s->fdsp);